X-Git-Url: https://git.jankratochvil.net/?p=gnokii.git;a=blobdiff_plain;f=gnokii%2Fgnokii.c;h=9b94644078a2cb38e3ca6e4e339ee81d8886a57e;hp=df3ce22df724c0741d3c177a43b2083d51d84358;hb=e434e7467e6c831f5b00f166483764f6f7649828;hpb=81b1712d54efa46b3148a5beb42d32d7632ef30c

diff --git a/gnokii/gnokii.c b/gnokii/gnokii.c
index df3ce22..9b94644 100644
--- a/gnokii/gnokii.c
+++ b/gnokii/gnokii.c
@@ -948,7 +948,7 @@ static int usage(void)
 
 #ifdef UCLINUX
   fprintf(stdout, _(
-"          gnokii --gnokiid [--debug]\n"
+"          gnokii --gnokiid [--debug] [<child to run> [<child args>...]]\n"
   ));
 #endif
 
@@ -1232,7 +1232,7 @@ int main(int argc, char *argv[])
 #endif /* UCLINUX */
 
 #ifdef UCLINUX
-    { OPT_GNOKIID,           0, 1, 0 },
+    { OPT_GNOKIID,           0, INT_MAX, 0 },
 #endif /* UCLINUX */
 
     { 0, 0, 0, 0 },
@@ -1280,6 +1280,7 @@ int main(int argc, char *argv[])
 
     for(i = 2; i < argc; i++)
       nargv[i-2] = argv[i];
+		nargv[argc] = NULL;	/* required by gnokiid() for execv(3) */
 	
     if(checkargs(c, gals, nargc)) {
 
@@ -4129,17 +4130,16 @@ static int gnokiid(int argc, char *argv[])
 	DebugMode = false;
 	if(argc>0)
 	{
-		if( strcmp(argv[0],"--debug" ))
+		if( !strcmp(argv[0],"--debug" ))
 		{
-			usage();
-			return -1;
-		}
-		else
 			DebugMode = true;
+			argv++;
+			argc--;
+		}
 	}
 
 #ifdef DEBUG
-  fprintf (stderr, _("Entering gnokiid mode...\n"));
+  fprintf (stderr, _("Initializing gnokiid mode...\n"));
 #endif
 
 	if (CFG_ReadConfig(&Model, &Port, &Initlength, &Connection, &BinDir, true) < 0)
@@ -4148,6 +4148,33 @@ static int gnokiid(int argc, char *argv[])
   if (VM_Initialise(Model, Port, Initlength, GCT_FBUS, BinDir, DebugMode, true, ""/*SynchronizeTime*/) == false)
 		return (-1);
 
+	if (argc>0) {
+#ifdef DEBUG
+		fprintf (stderr, _("Spawning gnokiid startup child process \"%s\"...\n"), *argv);
+#endif
+		/* default action for SIGCHLD is SIG_IGN, should be OK */
+		errno=0;
+		switch (vfork()) {
+			case -1: /* vfork() failure */
+				fprintf (stderr, _("vfork() failed! (%m)\n"));
+				return -1;
+			case 0: /* child */
+				execv(*argv,argv);
+				fprintf (stderr, _("Spawn of child process failed! (%m)\n"));
+				_exit(9);
+				break;
+			default: /* parent */
+				/* PASSTHRU */
+				break;
+			}
+		}
+
+#ifdef DEBUG
+  fprintf (stderr, _("Entering gnokiid virtual modem main loop...\n"));
+#endif
+
+	VM_ThreadLoop();
+
 	VM_Terminate();
 
   return 0;
@@ -7762,32 +7789,32 @@ int binringtoneconvert(int argc, char *argv[])
 	    w=w*2;
 	    if (w>z && (w/2)<=z) {
 	      switch (m) {
-	        case 1:fprintf(file,_("16"));break;
-		case 2:fprintf(file,_("8"));break;
-		case 3:fprintf(file,_("4"));break;
-		case 4:fprintf(file,_("2"));break;
-		case 5:fprintf(file,_("1"));break;
+	        case 1:fprintf(file,_("16"));break;
+		case 2:fprintf(file,_("8"));break;
+		case 3:fprintf(file,_("4"));break;
+		case 4:fprintf(file,_("2"));break;
+		case 5:fprintf(file,_("1"));break;
 	      }
 	      break;
 	    }
 	  }
 	  if (z>w) fprintf(file,_("1"));
 	  pause=false;
-          switch (GSM_GetNote(j)) {
-            case Note_C  :fprintf(file,_("c"));break;
-            case Note_Cis:fprintf(file,_("c#"));break;
-            case Note_D  :fprintf(file,_("d"));break;
-            case Note_Dis:fprintf(file,_("d#"));break;
-            case Note_E  :fprintf(file,_("e"));break;
-            case Note_F  :fprintf(file,_("f"));break;
-            case Note_Fis:fprintf(file,_("f#"));break;
-            case Note_G  :fprintf(file,_("g"));break;
-            case Note_Gis:fprintf(file,_("g#"));break;
-            case Note_A  :fprintf(file,_("a"));break;
-            case Note_Ais:fprintf(file,_("a#"));break;
-            case Note_H  :fprintf(file,_("h"));break;
-            default      :pause=true;fprintf(file,_("p"));break; //Pause ?
-          }
+          switch (GSM_GetNote(j)) {
+            case Note_C  :fprintf(file,_("c"));break;
+            case Note_Cis:fprintf(file,_("c#"));break;
+            case Note_D  :fprintf(file,_("d"));break;
+            case Note_Dis:fprintf(file,_("d#"));break;
+            case Note_E  :fprintf(file,_("e"));break;
+            case Note_F  :fprintf(file,_("f"));break;
+            case Note_Fis:fprintf(file,_("f#"));break;
+            case Note_G  :fprintf(file,_("g"));break;
+            case Note_Gis:fprintf(file,_("g#"));break;
+            case Note_A  :fprintf(file,_("a"));break;
+            case Note_Ais:fprintf(file,_("a#"));break;
+            case Note_H  :fprintf(file,_("h"));break;
+            default      :pause=true;fprintf(file,_("p"));break; //Pause ?
+          }
 	  w=deflen*1.5;
 	  for (m=0;m<6;m++) {
 	    w=w*2;
@@ -7932,11 +7959,11 @@ int setsimlock()
     fprintf(stderr,_("Error getting simlock info\n"));GSM->Terminate();return -1;
   }
   /* Opening all locks (we must check, if we can open them) */
-  NULL_SendMessageSequence
(50, &CurrentMagicError, 10, 0x40,openbuffer0);
-  openbuffer[4]=1;NULL_SendMessageSequence
(50, &CurrentMagicError, 10, 0x40,openbuffer);
-  openbuffer[4]=2;NULL_SendMessageSequence
(50, &CurrentMagicError, 10, 0x40,openbuffer);
-  openbuffer[4]=4;NULL_SendMessageSequence
(50, &CurrentMagicError, 10, 0x40,openbuffer);
-  openbuffer[4]=8;NULL_SendMessageSequence
(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer0);
+  openbuffer[4]=1;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  openbuffer[4]=2;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  openbuffer[4]=4;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  openbuffer[4]=8;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
   if (GSM->SimlockInfo(&siml)!=GE_NONE) {
     fprintf(stderr,_("Error getting simlock info\n"));GSM->Terminate();return -1;
   }
@@ -7985,13 +8012,13 @@ int setsimlock()
   }  
   /* Closing simlock with given values */
   closebuffer[4]=1+2+4+8;
-  NULL_SendMessageSequence
(50, &CurrentMagicError, 20, 0x40,closebuffer);  
+  NULL_SendMessageSequence(50, &CurrentMagicError, 20, 0x40,closebuffer);  
   /* Opening all locks */
-  NULL_SendMessageSequence
(50, &CurrentMagicError, 10, 0x40,openbuffer0);
-  openbuffer[4]=1;NULL_SendMessageSequence
(50, &CurrentMagicError, 10, 0x40,openbuffer);
-  openbuffer[4]=2;NULL_SendMessageSequence
(50, &CurrentMagicError, 10, 0x40,openbuffer);
-  openbuffer[4]=4;NULL_SendMessageSequence
(50, &CurrentMagicError, 10, 0x40,openbuffer);
-  openbuffer[4]=8;NULL_SendMessageSequence
(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer0);
+  openbuffer[4]=1;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  openbuffer[4]=2;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  openbuffer[4]=4;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  openbuffer[4]=8;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
   GSM->Reset(0x03);
   GSM->Terminate();
   return 0;
@@ -8091,7 +8118,7 @@ int geteeprom()
     
     if ((i/256)!=((i-1)/256)) fprintf(stderr,_("."));
     
-    if (NULL_SendMessageSequence(50, &CurrentMagicError, 9, 0x40,buffer)!=GE_NONE)
	  break;
+    if (NULL_SendMessageSequence(50, &CurrentMagicError, 9, 0x40,buffer)!=GE_NONE)	  break;
 
     i=i+0x10;
   }