Changeset 5379:2a383aaf4b1b in roaraudio
- Timestamp:
- 12/26/11 09:57:46 (12 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
configure
r5362 r5379 10 10 11 11 PATH="$PATH":/sbin:/usr/sbin:/usr/local/sbin:/usr/pkg/sbin # Ensure superuser paths 12 PATH="$PATH":/usr/lib/ssh:/usr/lib/openssh # Ensure SSH paths 12 13 13 14 # wine prints errors to stdout so stderr redirects do not work. … … 162 163 echo "$VERSION" 163 164 165 echo -n "checking for build stamp of this package... " 166 BUILD_STAMP="`date --utc +'%F %X'` (`id -un`@`uname -n`)" 167 echo "$BUILD_STAMP" 164 168 165 169 echo -n "checking for C compiler... " … … 1519 1523 echo "#define ROAR_VERSION_STRING \"$VERSION\"" 1520 1524 grep -E '^COMMON_V_(MAJOR|MINOR|REV) *= [0-9]*$' Makefile.inc | sed 's/^COMMON_V_/#define ROAR_VERSION_/; s/=//' 1525 echo "#define ROAR_BUILD_STAMP \"$BUILD_STAMP\"" 1521 1526 echo 1522 1527 [ "$DEFAULT_RATE" = '' ] || echo "#define ROAR_RATE_DEFAULT $DEFAULT_RATE" … … 1585 1590 test_tool_defmake ROAR_HAVE_BIN_PINENTRY PIN-Entry pinentry 1586 1591 test_tool_defmake ROAR_HAVE_BIN_SSH_ASKPASS SSH-AskPass ssh-askpass 1592 test_tool_defmake ROAR_HAVE_BIN_GTK_LED_ASKPASS GTK-LED-AskPass gtk-led-askpass 1593 test_tool_defmake ROAR_HAVE_BIN_X11_SSH_ASKPASS X11-SSH-AskPass x11-ssh-askpass 1594 test_tool_defmake ROAR_HAVE_BIN_GNOME_SSH_ASKPASS GNOME-SSH-AskPass gnome-ssh-askpass 1587 1595 test_tool_defmake ROAR_HAVE_BIN_GZIP Gzip gzip 1588 1596 test_tool_defmake ROAR_HAVE_BIN_BZIP2 bzip2 bzip2 … … 1797 1805 test_func_defmake ROAR_HAVE_ALARM alarm 'alarm(0)' -- sys/types.h unistd.h 1798 1806 test_func_defmake ROAR_HAVE_TIME time 'time((void*)0)' -- time.h 1807 test_func_defmake ROAR_HAVE_CTIME ctime 'ctime((void*)0)' -- time.h 1808 test_func_defmake ROAR_HAVE_CTIME_R ctime_r 'ctime_r((void*)0,(char*)0)' -- time.h 1799 1809 test_func_defmake ROAR_HAVE_KILL kill 'kill(0,0)' -- sys/types.h signal.h 1800 1810 test_func_defmake ROAR_HAVE_UNAME uname 'uname((void*)0)' -- sys/utsname.h -
libroar/socket.c
r5376 r5379 535 535 #endif 536 536 #if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6) 537 struct hostent * he ;537 struct hostent * he = NULL; 538 538 #endif 539 539 //unsigned int host_div = 0; … … 646 646 #if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6) 647 647 memset(&socket_addr, 0, sizeof(socket_addr)); 648 memset(&he, 0, sizeof(he)); // FIXME: we have a valid pointer in here????649 648 #endif 650 649 -
libroar/sshaskpass.c
r4708 r5379 36 36 #include "libroar.h" 37 37 38 #ifdef _ASKPASS 39 #undef _ASKPASS 40 #endif 41 42 #ifdef ROAR_HAVE_BIN_SSH_ASKPASS 43 #define _ASKPASS ROAR_HAVE_BIN_SSH_ASKPASS 44 #elif defined(ROAR_HAVE_BIN_GTK_LED_ASKPASS) 45 #define _ASKPASS ROAR_HAVE_BIN_GTK_LED_ASKPASS 46 #elif defined(ROAR_HAVE_BIN_X11_SSH_ASKPASS) 47 #define _ASKPASS ROAR_HAVE_BIN_X11_SSH_ASKPASS 48 #elif defined(ROAR_HAVE_BIN_GNOME_SSH_ASKPASS) 49 #define _ASKPASS ROAR_HAVE_BIN_GNOME_SSH_ASKPASS 50 #endif 51 38 52 int roar_sshaskpass_getpass (char ** pw, char * desc) { 39 #if defined( ROAR_HAVE_BIN_SSH_ASKPASS) && defined(ROAR_SUPPORT_PASSWORD_API) && defined(ROAR_HAVE_POPEN) && defined(ROAR_HAVE_PCLOSE)53 #if defined(_ASKPASS) && defined(ROAR_SUPPORT_PASSWORD_API) && defined(ROAR_HAVE_POPEN) && defined(ROAR_HAVE_PCLOSE) 40 54 FILE * cpipe; 41 55 char buf[1024]; … … 46 60 return -1; 47 61 48 if ( (cpipe = popen( ROAR_HAVE_BIN_SSH_ASKPASS, "r")) == NULL ) {62 if ( (cpipe = popen(_ASKPASS, "r")) == NULL ) { 49 63 return -1; 50 64 } … … 74 88 return 0; 75 89 #else 90 roar_err_set(ROAR_ERROR_NOSYS); 76 91 return -1; 77 92 #endif -
roarclients/roarctl.c
r5372 r5379 312 312 void server_time (struct roar_connection * con) { 313 313 struct roar_time time; 314 #ifdef ROAR_HAVE_CTIME_R 315 time_t server_time; 316 char server_time_buf[32]; 317 #endif 318 314 319 315 320 if ( roar_get_time(con, &time) == -1 ) { … … 318 323 } 319 324 325 #ifdef ROAR_HAVE_CTIME_R 326 server_time = time.t_sec; 327 if ( ctime_r(&server_time, server_time_buf) == NULL ) 328 server_time_buf[0] = 0; 329 330 if ( server_time_buf[0] ) 331 if ( server_time_buf[strlen(server_time_buf)-1] == '\n' ) 332 server_time_buf[strlen(server_time_buf)-1] = 0; 333 #endif 334 320 335 if ( g_verbose ) { 321 printf("Server time : %llu.%06llu [+%llu/2^64] sec\n", 336 printf("Server time : %s%s%s%llu.%06llu [+%llu/2^64] sec\n", 337 #ifdef ROAR_HAVE_CTIME_R 338 "\"", 339 server_time_buf, 340 "\" ", 341 #else 342 "", "", "", 343 #endif 322 344 (long long unsigned int)time.t_sec, 323 345 (long long unsigned int) time.t_ssec / 18446744073709LLU, … … 325 347 } else { 326 348 if ( time.c_freq == 1000000000LL && time.t_ssec == 0 ) { 327 printf("Server time : %llu sec\n", 349 printf("Server time : %s%s%s%llu sec\n", 350 #ifdef ROAR_HAVE_CTIME_R 351 "\"", 352 server_time_buf, 353 "\" ", 354 #else 355 "", "", "", 356 #endif 328 357 (long long unsigned int)time.t_sec); 329 358 } else { 330 printf("Server time : %llu.%06llu sec\n", 359 printf("Server time : %s%s%s%llu.%06llu sec\n", 360 #ifdef ROAR_HAVE_CTIME_R 361 "\"", 362 server_time_buf, 363 "\" ", 364 #else 365 "", "", "", 366 #endif 331 367 (long long unsigned int)time.t_sec, 332 368 (long long unsigned int) time.t_ssec / 18446744073709LLU); … … 1285 1321 display_stream(&con, atoi(argv[++i])); 1286 1322 } else if ( !strcmp(k, "allinfo") ) { 1323 server_info(&con); 1324 printf("\n"); 1325 server_time(&con); 1326 printf("\n"); 1327 lib_standards(); 1328 printf("\n"); 1287 1329 server_oinfo(&con, -1); 1288 1330 printf("\n"); -
roard/req.c
r5370 r5379 775 775 } 776 776 777 info.build = ROAR_BUILD_STAMP; 777 778 info.license = ROAR_LICENSE_GPLv3_0; 778 779
Note: See TracChangeset
for help on using the changeset viewer.