Changeset 894

Timestamp:

Jan 21, 2007 7:36:00 PM (17 years ago)

Author:

bennylp

Message:

Added ability to feed text file containing commands (on Windows) and sleep command to pjsua. Thanks Steven Halerman.

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -1844 +1844 @@
     puts("|  S  Send arbitrary REQUEST   |  V  Adjust audio Volume  |  f  Save config   |");
     puts("+------------------------------+--------------------------+-------------------+");
-    puts("|  q  QUIT                                                                    |");
+    puts("|  q  QUIT                  sleep N: console sleep for N ms                   |");
     puts("+=============================================================================+");
 
@@ -2072 +2072 @@
         fflush(stdout);
 
-        fgets(menuin, sizeof(menuin), stdin);
+        if (fgets(menuin, sizeof(menuin), stdin) == NULL) {
+            /* 
+             * Be friendly to users who redirect commands into
+             * program, when file ends, resume with kbd.
+             * If exit is desired end script with q for quit
+             */
+            /* Reopen stdin/stdout/stderr to /dev/console */
+#if defined(PJ_WIN32) && PJ_WIN32!=0
+            if (freopen ("CONIN$", "r", stdin) == NULL) {
+#else
+            if (1) {
+#endif
+                puts("Cannot switch back to console from file redirection");
+                menuin[0] = 'q';
+                menuin[1] = '\0';
+            } else {
+                puts("Switched back to console from file redirection");
+                continue;
+            }
+        }
 
         switch (menuin[0]) {
@@ -2618 +2637 @@
 
         case 's':
+            if (pj_ansi_strnicmp(menuin, "sleep", 5)==0) {
+                pj_str_t tmp;
+                int delay;
+
+                tmp.ptr = menuin+6;
+                tmp.slen = pj_ansi_strlen(menuin)-7;
+
+                if (tmp.slen < 1) {
+                    puts("Usage: sleep MSEC");
+                    break;
+                }
+
+                delay = pj_strtoul(&tmp);
+                if (delay < 0) delay = 0;
+                pj_thread_sleep(delay);
+                break;
+            }
+            /* Continue below */
+
         case 'u':
             /*