Added showmimeproc to test/common.sh.in so that test-show will test

[nmh] / sbr / context_save.c

diff --git a/sbr/context_save.c b/sbr/context_save.c
index 36b1634e7bfe71eceb4bb23fcf306e8877cff29b..70809595e06a2f5604c68f35a9fb37c8dc2c79e3 100644 (file)
--- a/sbr/context_save.c
+++ b/sbr/context_save.c
@@ -2,8 +2,6 @@
 /*
  * context_save.c -- write out the updated context file
  *
 /*
  * context_save.c -- write out the updated context file
  *

- * $Id$
- *

  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.


@@ -25,6 +23,7 @@ context_save (void)
     register struct node *np;
     FILE *out;
     sigset_t set, oset;
     register struct node *np;
     FILE *out;
     sigset_t set, oset;

+    int failed_to_lock = 0;

     
     /* No context in use -- silently ignore any changes! */
     if (!ctxpath)
     
     /* No context in use -- silently ignore any changes! */
     if (!ctxpath)


@@ -43,18 +42,25 @@ context_save (void)
     sigaddset (&set, SIGINT);
     sigaddset (&set, SIGQUIT);
     sigaddset (&set, SIGTERM);
     sigaddset (&set, SIGINT);
     sigaddset (&set, SIGQUIT);
     sigaddset (&set, SIGTERM);

-    SIGPROCMASK (SIG_BLOCK, &set, &oset);
-
-    if (!(out = lkfopen (ctxpath, "w")))
-       adios (ctxpath, "unable to write");
+    sigprocmask (SIG_BLOCK, &set, &oset);
+
+    if (!(out = lkfopendata (ctxpath, "w", &failed_to_lock))) {
+       if (failed_to_lock) {
+           adios (ctxpath, "failed to lock");
+       } else {
+           adios (ctxpath, "unable to write");
+       }
+    }

     for (np = m_defs; np; np = np->n_next)
        if (np->n_context)
            fprintf (out, "%s: %s\n", np->n_name, np->n_field);
     for (np = m_defs; np; np = np->n_next)
        if (np->n_context)
            fprintf (out, "%s: %s\n", np->n_name, np->n_field);

-    lkfclose (out, ctxpath);
+    lkfclosedata (out, ctxpath);

 
 

-    SIGPROCMASK (SIG_SETMASK, &oset, &set); /* reset the signal mask */
+    sigprocmask (SIG_SETMASK, &oset, &set); /* reset the signal mask */

 
     if (action == 0)
 
     if (action == 0)

+       /* This must be _exit(), not exit(), because the child didn't
+          call unregister_for_removal() in m_chkids(). */

        _exit (0);              /* we are child, time to die */
 }
 
        _exit (0);              /* we are child, time to die */
 }
 


@@ -85,8 +91,8 @@ m_chkids (void)
            break;
 
        case 0:
            break;
 
        case 0:

-           setgid (getgid ());
-           setuid (getuid ());
+           /* It's not necessary to call unregister_for_removal(0)
+               because the child calls _exit() in context_save(). */

            break;
 
        default:
            break;
 
        default: