pending-release-notes: add mhshow's "-prefer", and mh-format's %(kibi/kilo)

[nmh] / sbr / context_save.c

diff --git a/sbr/context_save.c b/sbr/context_save.c
index 5224af4ce403a7a390c2246fd3d8db82064949e6..70809595e06a2f5604c68f35a9fb37c8dc2c79e3 100644 (file)
--- a/sbr/context_save.c
+++ b/sbr/context_save.c
@@ -23,6 +23,7 @@ context_save (void)
     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)
@@ -43,8 +44,13 @@ context_save (void)
     sigaddset (&set, SIGTERM);
     sigprocmask (SIG_BLOCK, &set, &oset);
 
-    if (!(out = lkfopendata (ctxpath, "w")))
-       adios (ctxpath, "unable to write");
+    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);
@@ -53,6 +59,8 @@ context_save (void)
     sigprocmask (SIG_SETMASK, &oset, &set); /* reset the signal mask */
 
     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 */
 }
 
@@ -83,8 +91,8 @@ m_chkids (void)
            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: