Changeset 27611

Timestamp:

Apr 5, 2010, 3:47:36 PM (16 years ago)

Author:

eugene

Message:

pendatic checking fscan, system, and mkstemp return values

Location:

trunk/Ohana/src

Files:

• elixir/src/RemoteOps.c (modified) (9 diffs)
• gastro/src/gcenter.c (modified) (2 diffs)
• gastro/src/getusno.c (modified) (1 diff)
• gastro/src/gfit.c (modified) (1 diff)
• gastro2/src/plots.c (modified) (6 diffs)
• imregister/imreg/ConfigPID.c (modified) (2 diffs)
• imregister/imreg/SetSignals.c (modified) (1 diff)
• imregister/imreg/imregclient.c (modified) (1 diff)
• imregister/imreg/rconnect.c (modified) (1 diff)
• imregister/src/imstatreg.c (modified) (1 diff)
• nightd/src/GetStatus.c (modified) (2 diffs)
• nightd/src/misc.c (modified) (3 diffs)
• opihi/cmd.astro/flux.c (modified) (1 diff)
• opihi/cmd.basic/help.c (modified) (1 diff)
• opihi/cmd.basic/list_help.c (modified) (1 diff)
• opihi/cmd.data/queuedrop.c (modified) (1 diff)
• opihi/dvo/elixir.c (modified) (1 diff)
• opihi/lib.shell/interrupt.c (modified) (1 diff)
• relphot/src/plotstuff.c (modified) (1 diff)

trunk/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);
 

trunk/Ohana/src/gastro/src/gcenter.c

@@ -79 +79 @@
     fprintf (stderr, "plotting %d points\n", Nvect);
     fprintf (stderr, "type return to continue");
-    fscanf (stdin, "%c", &c);
+    if (fscanf (stdin, "%c", &c) != 1) {
+      fprintf (stderr, "\n");
+    }
     Nvect = 0;
   }
@@ -166 +168 @@
       fprintf (stderr, "plotting %d points\n", Nvect);
       fprintf (stderr, "type return to continue");
-      fscanf (stdin, "%c", &c);
+      if (fscanf (stdin, "%c", &c) != 1) {
+        fprintf (stderr, "\n");
+      }
       Nvect = 0;
     }

trunk/Ohana/src/gastro/src/getusno.c

@@ -58 +58 @@
       fprintf (stderr, "can't open file %s, is cdrom %d in drive?\n", filename, disk);
       fprintf (stderr, "press return when ready to continue: ");
-      fscanf (stdin, "%c", &c);
+      if (fscanf (stdin, "%c", &c) != 1) fprintf (stderr, "\n");
       fprintf (stderr, "trying again...\n");
       f = fopen (filename, "r");

trunk/Ohana/src/gastro/src/gfit.c

@@ -242 +242 @@
       fprintf (stderr, "plotting %d points\n", Nvect);
       fprintf (stderr, "type return to continue");
-      fscanf (stdin, "%c", &c);
+      if (fscanf (stdin, "%c", &c) != 1) fprintf (stderr, "\n");
       Nvect = 0;
     }

trunk/Ohana/src/gastro2/src/plots.c

@@ -61 +61 @@
   DonePlotting (&gv, 2);
   fprintf (stderr, "type return to continue");
-  fscanf (stdin, "%c", &c);
+  if (fscanf (stdin, "%c", &c) != 1) fprintf (stderr, "\n");
   free (xv);
   free (yv);
@@ -117 +117 @@
   DonePlotting (&graphdata, Xg[version]);
   fprintf (stderr, "type return to continue");
-  fscanf (stdin, "%c", &c);
+  if (fscanf (stdin, "%c", &c) != 1) fprintf (stderr, "\n");
 }
 
@@ -161 +161 @@
   DonePlotting (&graphdata, 0);
   fprintf (stderr, "type return to continue");
-  fscanf (stdin, "%c", &c);
+  if (fscanf (stdin, "%c", &c) != 1) fprintf (stderr, "\n");
 }
 
@@ -245 +245 @@
   DonePlotting (&gf, 1);
   fprintf (stderr, "type return to continue");
-  fscanf (stdin, "%c", &c);
+  if (fscanf (stdin, "%c", &c) != 1) fprintf (stderr, "\n");
 }
 
@@ -261 +261 @@
   PlotVector (n, y, 1, 1);
   fprintf (stderr, "type return to continue");
-  fscanf (stdin, "%c", &c);
+  if (fscanf (stdin, "%c", &c) != 1) fprintf (stderr, "\n");
 }  
 
@@ -336 +336 @@
   DonePlotting (&graphdata, 0);
   fprintf (stderr, "type return to continue");
-  fscanf (stdin, "%c", &c);
+  if (fscanf (stdin, "%c", &c) != 1) fprintf (stderr, "\n");
 
 }

trunk/Ohana/src/imregister/imreg/ConfigPID.c

@@ -65 +65 @@
 int LoadPID (char *file, pid_t *pid, char *username, char *machine) {
 
+  int t1, t2, t3;
   FILE *f;
 
@@ -72 +73 @@
   }
 
-  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);
 

trunk/Ohana/src/imregister/imreg/SetSignals.c

@@ -104 +104 @@
   }
   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 < 300; i++) {

trunk/Ohana/src/imregister/imreg/imregclient.c

@@ -22 +22 @@
       exit (1);
     }
-    fscanf (f, "%f %f", &image[0].sky, &image[0].bias);
+    if (fscanf (f, "%f %f", &image[0].sky, &image[0].bias) != 2) {
+      fprintf (stderr, "error reading stats\n");
+    }
     fclose (f);
     image[0].fwhm = get_fwhm (datfile);

trunk/Ohana/src/imregister/imreg/rconnect.c

@@ -87 +87 @@
      without setting onintr */
   sprintf (buffer, "onintr\n");
-  write (*wsock, buffer, strlen(buffer));
+  if (write (*wsock, buffer, strlen (buffer)) != strlen(buffer)) {
+    fprintf (stderr, "error sending signal\n");
+    close (*wsock);
+    close (*rsock);
+    return (FALSE);
+  }
+
   if ((status == -1) && (errno == EPIPE)) {
     fprintf (stderr, "socket closed unexpectedly\n");

trunk/Ohana/src/imregister/src/imstatreg.c

@@ -70 +70 @@
 
     /* delete, unlock existing database */
-    truncate (TempDB, 0);
+    if (truncate (TempDB, 0)) {
+      fprintf (stderr, "error truncating temp db\n");
+      exit (1);
+    }
     gfits_db_close (&temp_db);
     fprintf (stderr, "temporary database closed\n");

trunk/Ohana/src/nightd/src/GetStatus.c

@@ -33 +33 @@
 
   sprintf (line, "rsh %s kill -USR1 %d", machine, pid);
-  system (line);
+  if (system (line) == -1) {
+    fprintf (stderr, "failed to send signal\n");
+  }
   exit (0);
 
@@ -50 +52 @@
 
   sprintf (line, "rsh %s kill -TERM %d", machine, pid);
-  system (line);
+  if (system (line) == -1) {
+    fprintf (stderr, "failed to send signal\n");
+  }
   exit (0);
 

trunk/Ohana/src/nightd/src/misc.c

@@ -11 +11 @@
 int SetPID (pid_t *Xpid, char *Xuser, char *Xmachine) {
   
+  int t1, t2, t3;
   pid_t pid;
   char *username, machine[256];
@@ -43 +44 @@
   }
 
-  fscanf (f, "%*s %d", Xpid);
-  fscanf (f, "%*s %s", Xuser);
-  fscanf (f, "%*s %s", Xmachine);
+  t1 = fscanf (f, "%*s %d", Xpid);
+  t2 = fscanf (f, "%*s %s", Xuser);
+  t3 = fscanf (f, "%*s %s", Xmachine);
+  if ((t1 != 1) || (t2 != 2) || (t3 != 1)) {
+    fprintf (stderr, "error reading pid info\n");
+  }
   fclose (f);
   return (FALSE);
@@ -125 +129 @@
 
   eof = 0x04;
-  write (wfd[1], &eof, 1);
+  if (write (wfd[1], &eof, 1) != 1) fprintf (stderr, "!\n");
   close (wfd[1]);
  

trunk/Ohana/src/opihi/cmd.astro/flux.c

@@ -29 +29 @@
   ymax = 0;
   for (i = 0; i < 4; i++) {
-    fscanf (f, "%lf %lf", &x[i], &y[i]);
+    if (fscanf (f, "%lf %lf", &x[i], &y[i]) != 2) {
+      fprintf (stderr, "error reading coordinates from %s\n", argv[2]);
+      fclose (f);
+      return (FALSE);
+    }
     xmin = MAX (0, MIN (xmin, x[i] - 1));
     ymin = MAX (0, MIN (ymin, y[i] - 1));

trunk/Ohana/src/opihi/cmd.basic/help.c

@@ -15 +15 @@
   if (argc == 1) {
     sprintf (buff, "ls %s", helpdir);
-    system (buff);
+    if (system (buff) == -1) {
+      fprintf (stderr, "help directory unavailable\n");
+      return (FALSE);
+    }
     return (TRUE);
   }

trunk/Ohana/src/opihi/cmd.basic/list_help.c

@@ -18 +18 @@
     fclose (f);
     sprintf (line, "more %s", filename);
-    system (line);
+    if (system (line) == -1) {
+      fprintf (stderr, "help list unavailable\n");
+    }
   }
   unlink (filename);

trunk/Ohana/src/opihi/cmd.data/queuedrop.c

@@ -4 +4 @@
   
   int N;
-  char *Key;
-  char *line;
-  char *Value;
-  Queue *queue;
+  char *Key = NULL;
+  char *line = NULL;
+  Queue *queue = NULL;
+  char *Value = NULL;
 
   Key = NULL;

trunk/Ohana/src/opihi/dvo/elixir.c

@@ -46 +46 @@
 
   sprintf (msgfile, "%s/EMsg.XXXXXX", fifodir);
-  mkstemp (msgfile);
+  if (mkstemp (msgfile) == -1) {
+    gprint (GP_ERR, "can't create fifo\n");
+    return (FALSE);
+  }
   sprintf (message, "%s %s", cmd, msgfile);
   unlink (msgfile);

trunk/Ohana/src/opihi/lib.shell/interrupt.c

@@ -27 +27 @@
   while (1) {
     gprint (GP_ERR, "operation halted, continue? (y/n) ");
-    fscanf (stdin, "%s", string);
+    if (fscanf (stdin, "%s", string) != 1) fprintf (stderr, "what?\n");
     
     if ((string[0] == 'y') || (string[0] == 'Y')) {

trunk/Ohana/src/relphot/src/plotstuff.c

@@ -149 +149 @@
   if (PLOTDELAY > 500000) {
     fprintf (stdout, "press return\n"); 
-    fscanf (stdin, "%*c");
+    if (fscanf (stdin, "%*c") != 1) fprintf (stderr, "\n");
   } else {
     usleep (PLOTDELAY);