Changeset 27840 for branches/simtest_nebulous_branches/Ohana/src/elixir/src/RemoteOps.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/elixir/src/RemoteOps.c (modified) (9 diffs)

branches/simtest_nebulous_branches/Ohana/src/elixir/src/RemoteOps.c

@@ -20 +20 @@
   }
   sprintf (line, "kill -USR1 %d\n", pid);
-  write (wsock, line, strlen (line));
+  if (write (wsock, line, strlen (line)) != strlen(line)) {
+    fprintf (stderr, "error sending signal\n");
+    exit (1);
+  }
 
   for (i = 0; i < 100; i++) {
@@ -49 +52 @@
   }
   sprintf (line, "kill -TERM %d\n", pid);
-  write (wsock, line, strlen (line));
+  if (write (wsock, line, strlen (line)) != strlen(line)) {
+    fprintf (stderr, "error sending signal\n");
+    exit (1);
+  }
 
   for (i = 0; i < 100; i++) {
@@ -75 +81 @@
 
   sprintf (response, "%s.XXXXXX", msgfile);
-  mkstemp (response);
+  if (mkstemp (response) == -1) {
+    fprintf (stderr, "can't make temp file\n");
+    exit (1);
+  }
   sprintf (message, "STATUS %s", response);
   if (VERBOSE) fprintf (stderr, "sending message: %s\n", message);
@@ -86 +95 @@
   }
   sprintf (line, "kill -USR2 %d\n", pid);
-  write (wsock, line, strlen (line));
+  if (write (wsock, line, strlen (line)) != strlen(line)) {
+    fprintf (stderr, "error sending signal\n");
+    exit (1);
+  }
 
   /* wait (2 sec) for file to exist, then try to read it */
@@ -146 +158 @@
   /* send TERM signal */
   sprintf (line, "kill -TERM %d\n", pid);
-  write (wsock, line, strlen (line));
+  if (write (wsock, line, strlen (line)) != strlen(line)) {
+    fprintf (stderr, "error sending signal\n");
+    exit (1);
+  }
 
   /* wait for cleanup to finish */
@@ -159 +174 @@
   /* kill meanly */
   sprintf (line, "kill -KILL %d", pid);
-  write (wsock, line, strlen (line));
+  if (write (wsock, line, strlen (line)) != strlen(line)) {
+    fprintf (stderr, "error sending signal\n");
+    exit (1);
+  }
+
   unlink (pidfile);
 
@@ -165 +184 @@
  success:
   sprintf (line, "exit\n");
-  write (wsock, line, strlen(line));
+  if (write (wsock, line, strlen (line)) != strlen(line)) {
+    fprintf (stderr, "error sending signal\n");
+    exit (1);
+  }
   close (wsock);
   close (rsock);
@@ -174 +196 @@
 int LoadPID (char *file, pid_t *pid, char *username, char *machine) {
 
+  int t1, t2, t3;
   FILE *f;
 
@@ -181 +204 @@
   }
 
-  fscanf (f, "%*s %d", pid);
-  fscanf (f, "%*s %s", username);
-  fscanf (f, "%*s %s", machine);
+  t1 = fscanf (f, "%*s %d", pid);
+  t2 = fscanf (f, "%*s %s", username);
+  t3 = fscanf (f, "%*s %s", machine);
+  if ((t1 != 1) || (t2 != 2) || (t3 != 1)) {
+    fprintf (stderr, "error reading pid info\n");
+  }
   fclose (f);