Changeset 3900:71782afc24b2 in roaraudio

Timestamp:

05/25/10 18:49:44 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

check for some more f*()-functions

Files:

• configure (modified) (1 diff)
• libroar/sshaskpass.c (modified) (1 diff)
• libroar/vio_stdio.c (modified) (2 diffs)

configure

@@ -1171 +1171 @@
 test_func_defmake ROAR_HAVE_OPENLOG   openlog   'openlog("", 0, 0)'          -- syslog.h
 test_func_defmake ROAR_HAVE_CLOSELOG  closelog  'closelog()'                 -- syslog.h
+test_func_defmake ROAR_HAVE_FILENO    fileno    'fileno(0)'                  -- stdio.h
+test_func_defmake ROAR_HAVE_FTELL     ftell     'ftell(0)'                   -- stdio.h
+test_func_defmake ROAR_HAVE_FSEEK     fseek     'fseek(0, 0, 0)'             -- stdio.h
+test_func_defmake ROAR_HAVE_POPEN     popen     'popen("", "")'              -- stdio.h
+test_func_defmake ROAR_HAVE_PCLOSE    pclose    'pclose(0)'                  -- stdio.h
 
 echo -n 'checking for basic IO calls... '

libroar/sshaskpass.c

@@ -37 +37 @@
 
 int roar_sshaskpass_getpass   (char ** pw, char * desc) {
-#if defined(ROAR_HAVE_BIN_SSH_ASKPASS) && defined(ROAR_SUPPORT_PASSWORD_API)
+#if defined(ROAR_HAVE_BIN_SSH_ASKPASS) && defined(ROAR_SUPPORT_PASSWORD_API) && defined(ROAR_HAVE_POPEN) && defined(ROAR_HAVE_PCLOSE)
  FILE * cpipe;
  char   buf[1024];

libroar/vio_stdio.c

@@ -124 +124 @@
 
 off_t   roar_vio_stdio_lseek   (struct roar_vio_calls * vio, off_t offset, int whence) {
+#if defined(ROAR_HAVE_FSEEK) && defined(ROAR_HAVE_FTELL)
  if ( fseek((FILE*)(vio->inst), offset, whence) == -1 )
   return -1;
 
  return ftell((FILE*)(vio->inst));
+#else
+ return (off_t)-1;
+#endif
 }
 
@@ -147 +151 @@
     return 0;
    break;
+#ifdef ROAR_HAVE_FILENO
   case ROAR_VIO_CTL_GET_FH:
   case ROAR_VIO_CTL_GET_READ_FH:
   case ROAR_VIO_CTL_GET_WRITE_FH:
+  case ROAR_VIO_CTL_GET_SELECT_FH:
+  case ROAR_VIO_CTL_GET_SELECT_READ_FH:
+  case ROAR_VIO_CTL_GET_SELECT_WRITE_FH:
    *(int*)data = fileno((FILE*)(vio->inst));
     return 0;
    break;
+#endif
  }