Changeset 5379:2a383aaf4b1b in roaraudio for roarclients

Timestamp:

12/26/11 09:57:46 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

• Cleanup,
• Set ISIT_BUILD in roard,
• Test for more alternatives for ssh-askpass,
• Display more infors in "allinfo" command in roarctl,
• Display server time using ctime_r() in roarctl.

File:

• roarclients/roarctl.c (modified) (4 diffs)

roarclients/roarctl.c

@@ -312 +312 @@
 void server_time (struct roar_connection * con) {
  struct roar_time time;
+#ifdef ROAR_HAVE_CTIME_R
+ time_t server_time;
+ char server_time_buf[32];
+#endif
+
 
  if ( roar_get_time(con, &time) == -1 ) {
@@ -318 +323 @@
  }
 
+#ifdef ROAR_HAVE_CTIME_R
+ server_time = time.t_sec;
+ if ( ctime_r(&server_time, server_time_buf) == NULL )
+  server_time_buf[0] = 0;
+
+ if ( server_time_buf[0] )
+  if ( server_time_buf[strlen(server_time_buf)-1] == '\n' )
+   server_time_buf[strlen(server_time_buf)-1] = 0;
+#endif
+
  if ( g_verbose ) {
-  printf("Server time           : %llu.%06llu [+%llu/2^64] sec\n",
+  printf("Server time           : %s%s%s%llu.%06llu [+%llu/2^64] sec\n",
+#ifdef ROAR_HAVE_CTIME_R
+         "\"",
+         server_time_buf,
+         "\" ",
+#else
+         "", "", "",
+#endif
          (long long unsigned int)time.t_sec,
          (long long unsigned int) time.t_ssec / 18446744073709LLU,
@@ -325 +347 @@
  } else {
   if ( time.c_freq == 1000000000LL && time.t_ssec == 0 ) {
-   printf("Server time           : %llu sec\n",
+   printf("Server time           : %s%s%s%llu sec\n",
+#ifdef ROAR_HAVE_CTIME_R
+         "\"",
+         server_time_buf,
+         "\" ",
+#else
+         "", "", "",
+#endif
           (long long unsigned int)time.t_sec);
   } else {
-   printf("Server time           : %llu.%06llu sec\n",
+   printf("Server time           : %s%s%s%llu.%06llu sec\n",
+#ifdef ROAR_HAVE_CTIME_R
+         "\"",
+         server_time_buf,
+         "\" ",
+#else
+         "", "", "",
+#endif
           (long long unsigned int)time.t_sec,
           (long long unsigned int) time.t_ssec / 18446744073709LLU);
@@ -1285 +1321 @@
    display_stream(&con, atoi(argv[++i]));
   } else if ( !strcmp(k, "allinfo") ) {
+   server_info(&con);
+   printf("\n");
+   server_time(&con);
+   printf("\n");
+   lib_standards();
+   printf("\n");
    server_oinfo(&con, -1);
    printf("\n");