minit

commit 1e4ea807428fd2a23c338284f02d8e71fe0290f7
parent 44a92491662e76e2bb92524b1ca050314294fcdc
Author: leitner <leitner>
Date:   Thu,  8 Nov 2001 21:32:21 +0000

fix minit and msvc so they handle msvc -P correctly.

Diffstat:
M
CHANGES
 | 
4
++++
M
minit.c
 | 
32
++++++++++++++++++--------------
M
msvc.c
 | 
4
++--

3 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+0.6.1:
+  fixed msvc and minit handling of msvc -P.
+  pidfilehack has now actually been tested and works with ssh.
+
 0.6:
   add tty and session leadership magic and I actually got getty to work
     as init on my laptop, i.e. in production use!
diff --git a/minit.c b/minit.c
@@ -123,16 +123,6 @@ int isup(int service) {
   return (root[service].pid!=0);
 }
 
-static void _puts(const char* s) {
-  write(1,s,strlen(s));
-}
-
-void sulogin() {	/* exiting on an initialization failure is not a good idea for init */
-  char *argv[]={"sulogin",0};
-  if (i_am_init) execve("/sbin/sulogin",argv,environ);
-  exit(1);
-}
-
 #undef debug
 void handlekilled(pid_t killed) {
   int i;
@@ -144,8 +134,7 @@ void handlekilled(pid_t killed) {
   }
 #endif
   if (killed == (pid_t)-1) {
-    _puts("minit: all services exited.\n");
-    sulogin();
+    write(2,"all services exited.\n",21);
     exit(0);
   }
   if (killed==0) return;
@@ -312,6 +301,16 @@ int startservice(int service,int pause) {
   return 0;
 }
 
+void sulogin() {	/* exiting on an initialization failure is not a good idea for init */
+  char *argv[]={"sulogin",0};
+  execve("/sbin/sulogin",argv,environ);
+  exit(1);
+}
+
+static void _puts(const char* s) {
+  write(1,s,strlen(s));
+}
+
 void childhandler() {
   int status;
   pid_t killed;
@@ -421,7 +420,7 @@ main(int argc, char *argv[]) {
 	break;
       }
       opendevconsole();
-      _puts("minit: poll failed!\n");
+      _puts("poll failed!\n");
       sulogin();
       /* what should we do if poll fails?! */
       break;
@@ -448,7 +447,12 @@ error:
 	    root[idx].respawn=1;
 	    goto ok;
 	  case 'P':
-	    tmp=strtol(buf+strlen(buf)+1,0);
+	    {
+	      unsigned char *x=buf+strlen(buf)+1;
+	      unsigned char c;
+	      tmp=0;
+	      while ((c=*x++-'0')<10) tmp=tmp*10+c;
+	    }
 	    if (tmp>0) pid=tmp;
 	    root[idx].pid=tmp;
 	    goto ok;
diff --git a/msvc.c b/msvc.c
@@ -38,9 +38,9 @@ int setpid(char *service, pid_t pid) {
   int len;
   buf[0]='P';
   strncpy(buf+1,service,1400);
-  tmp+=strlen(buf);
+  tmp=buf+strlen(buf)+1;
   tmp[fmt_ulong(tmp,pid)]=0;
-  write(infd,buf,strlen(buf));
+  write(infd,buf,strlen(buf)+strlen(tmp)+2);
   len=read(outfd,buf,1500);
   return (len!=1 || buf[0]=='0');
 }