Changeset 2596 for vendor/gnumake/current/vmsjobs.c

Timestamp:

Jun 20, 2012, 12:44:52 AM (13 years ago)

Author:

bird

Message:

gnumake/current -> 3.82-cvs.

Location:

vendor/gnumake/current

Files:

• . (modified) (1 prop)
• vmsjobs.c (modified) (18 diffs, 1 prop)

vendor/gnumake/current/vmsjobs.c

@@ -3 +3 @@
 
 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-2007 Free Software Foundation, Inc.
+2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
@@ -111 +111 @@
 }
 
-/* This is called as an AST when a child process dies (it won't get
-   interrupted by anything except a higher level AST).
+static int ctrlYPressed= 0;
+/* This is called at main or AST level. It is at AST level for DONTWAITFORCHILD
+   and at main level otherwise. In any case it is called when a child process
+   terminated. At AST level it won't get interrupted by anything except a
+   inner mode level AST.
 */
 int
@@ -124 +127 @@
 
     lib$free_ef(&child->efn);
+    if (child->comname)
+      {
+        if (!ISDB (DB_JOBS)&&!ctrlYPressed)
+          unlink (child->comname);
+        free (child->comname);
+      }
 
     (void) sigblock (fatal_signal_mask);
@@ -220 +229 @@
 static int oldCtrlMask;
 static int setupYAstTried= 0;
-static int pidToAbort= 0;
-static int chan= 0;
+static unsigned short int chan= 0;
 
 static void
@@ -229 +237 @@
 }
 
-static void
-astHandler (void)
+static int
+astYHandler (void)
 {
-        if (pidToAbort) {
-                sys$forcex (&pidToAbort, 0, SS$_ABORT);
-                pidToAbort= 0;
-        }
+        struct child *c;
+        for (c = children; c != 0; c = c->next)
+                sys$delprc (&c->pid, 0, 0);
+        ctrlYPressed= 1;
         kill (getpid(),SIGQUIT);
+        return SS$_NORMAL;
 }
 
@@ -248 +257 @@
                 int     dvi;
         } iosb;
+        unsigned short int loc_chan;
 
         setupYAstTried++;
 
-        if (!chan) {
-                status= sys$assign(&inputDsc,&chan,0,0);
+        if (chan)
+          loc_chan= chan;
+        else {
+                status= sys$assign(&inputDsc,&loc_chan,0,0);
                 if (!(status&SS$_NORMAL)) {
                         lib$signal(status);
@@ -258 +270 @@
                 }
         }
-        status= sys$qiow (0, chan, IO$_SETMODE|IO$M_CTRLYAST,&iosb,0,0,
-                astHandler,0,0,0,0,0);
-        if (status==SS$_NORMAL)
-                status= iosb.status;
-        if (status==SS$_ILLIOFUNC || status==SS$_NOPRIV) {
-                sys$dassgn(chan);
-#ifdef  CTRLY_ENABLED_ANYWAY
-                fprintf (stderr,
-                         _("-warning, CTRL-Y will leave sub-process(es) around.\n"));
-#else
-                return;
-#endif
-        }
-        else if (!(status&SS$_NORMAL)) {
-                sys$dassgn(chan);
-                lib$signal(status);
+        status= sys$qiow (0, loc_chan, IO$_SETMODE|IO$M_CTRLYAST,&iosb,0,0,
+                          astYHandler,0,0,0,0,0);
+        if (status==SS$_NORMAL)
+                status= iosb.status;
+        if (status!=SS$_NORMAL) {
+                if (!chan)
+                        sys$dassgn(loc_chan);
+                if (status!=SS$_ILLIOFUNC && status!=SS$_NOPRIV)
+                        lib$signal(status);
                 return;
         }
@@ -288 +293 @@
                 return;
         }
+        if (!chan)
+                chan = loc_chan;
 }
 
@@ -300 +307 @@
   static struct dsc$descriptor_s efiledsc;
   int have_redirection = 0;
+  int have_append = 0;
   int have_newline = 0;
 
@@ -306 +314 @@
   char *cmd = alloca (strlen (argv) + 512), *p, *q;
   char ifile[256], ofile[256], efile[256];
-  char *comname = 0;
+  int comnamelen;
   char procname[100];
   int in_string;
@@ -315 +323 @@
   ofile[0] = 0;
   efile[0] = 0;
+  child->comname = NULL;
 
   DB (DB_JOBS, ("child_execute_job (%s)\n", argv));
@@ -384 +393 @@
             else
               {
+                if (*(p+1) == '>')
+                  {
+                    have_append = 1;
+                    p += 1;
+                  }
                 p = vms_redirect (&ofiledsc, ofile, p);
               }
@@ -482 +496 @@
         }
 
-      outfile = open_tmpfile (&comname, "sys$scratch:CMDXXXXXX.COM");
+      outfile = open_tmpfile (&child->comname, "sys$scratch:CMDXXXXXX.COM");
       if (outfile == 0)
         pfatal_with_name (_("fopen (temporary file)"));
+      comnamelen = strlen (child->comname);
 
       if (ifile[0])
@@ -502 +517 @@
       if (ofile[0])
         {
-          fprintf (outfile, "$ define sys$output %s\n", ofile);
-          DB (DB_JOBS, (_("Redirected output to %s\n"), ofile));
-          ofiledsc.dsc$w_length = 0;
+          if (have_append)
+            {
+              fprintf (outfile, "$ set noon\n");
+              fprintf (outfile, "$ define sys$output %.*s\n", comnamelen-3, child->comname);
+              DB (DB_JOBS, (_("Append output to %s\n"), ofile));
+              ofiledsc.dsc$w_length = 0;
+            }
+          else
+            {
+              fprintf (outfile, "$ define sys$output %s\n", ofile);
+              DB (DB_JOBS, (_("Redirected output to %s\n"), ofile));
+              ofiledsc.dsc$w_length = 0;
+            }
         }
 
@@ -559 +584 @@
         }
 
-      fwrite (p, 1, q - p, outfile);
+      if (*p)
+        {
+          fwrite (p, 1, --q - p, outfile);
       fputc ('\n', outfile);
+        }
+
+      if (have_append)
+        {
+          fprintf (outfile, "$ deassign sys$output ! 'f$verify(0)\n");
+          fprintf (outfile, "$ append:=append\n");
+          fprintf (outfile, "$ delete:=delete\n");
+          fprintf (outfile, "$ append/new %.*s %s\n", comnamelen-3, child->comname, ofile);
+          fprintf (outfile, "$ delete %.*s;*\n", comnamelen-3, child->comname);
+          DB (DB_JOBS, (_("Append %.*s and cleanup\n"), comnamelen-3, child->comname));
+        }
 
       fclose (outfile);
 
-      sprintf (cmd, "$ @%s", comname);
+      sprintf (cmd, "$ @%s", child->comname);
 
       DB (DB_JOBS, (_("Executing %s instead\n"), cmd));
@@ -579 +617 @@
       status = lib$get_ef ((unsigned long *)&child->efn);
       if (!(status & 1))
-        return 0;
+        {
+          if (child->comname)
+            {
+              if (!ISDB (DB_JOBS))
+                unlink (child->comname);
+              free (child->comname);
+            }
+          return 0;
+        }
     }
 
@@ -648 +694 @@
   if (status & 1)
     {
-      pidToAbort= child->pid;
       status= sys$waitfr (child->efn);
-      pidToAbort= 0;
       vmsHandleChildTerm(child);
     }
@@ -678 +722 @@
     }
 
-  if (comname && !ISDB (DB_JOBS))
-    unlink (comname);
-
   return (status & 1);
 }