Refer to just "root" in slocal man page.

[mmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index 3c3e4f6..a04ebd6 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -130,7 +130,7 @@ main (int argc, char **argv)
     int msgp = 0, anot = 0, inplace = 1, mime = 0;
     int issue = 0, volume = 0, dashstuff = 0;
     int nedit = 0, nwhat = 0, i, in;
-    int out, isdf = 0, msgnum;
+    int out, isdf = 0, msgnum = 0;
     int outputlinelen = OUTPUTLINELEN;
     int dat[5];
     char *cp, *cwd, *maildir, *dfolder = NULL;
@@ -167,10 +167,10 @@ main (int argc, char **argv)
                    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                    print_help (buf, switches, 1);
-                   done (1);
+                   done (0);
                case VERSIONSW:
                    print_version(invo_name);
-                   done (1);
+                   done (0);
 
                case ANNOSW: 
                    anot++;
@@ -430,17 +430,19 @@ try_it_again:
                issue = 0;
            issue++;
        }
-       if (volume == 0)
+       if (volume == 0) {
            snprintf (buf, sizeof(buf), VFORMAT, digest);
-       if ((cp = context_find (buf)) == NULL || (volume = atoi (cp)) <= 0)
-           volume = 1;
+           if ((cp = context_find (buf)) == NULL || (volume = atoi (cp)) <= 0)
+               volume = 1;
+       }
        if (!form)
            form = digestcomps;
     } else {
-       form = forwcomps;
+       if (!form)
+           form = forwcomps;
     }
 
-    dat[0] = issue;
+    dat[0] = digest ? issue : msgnum;
     dat[1] = volume;
     dat[2] = 0;
     dat[3] = outputlinelen;
@@ -497,7 +499,7 @@ try_it_again:
     if (nwhat)
        done (0);
     what_now (ed, nedit, NOUSE, drft, NULL, 0, mp,
-       anot ? "Forwarded" : NULL, inplace, cwd);
+       anot ? "Forwarded" : NULL, inplace, cwd, 0);
     done (1);
     return 1;
 }
@@ -658,7 +660,7 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst
     if (digest) {
        strncpy (buffer, delim4, sizeof(buffer));
     } else {
-       snprintf (buffer, sizeof(buffer), "\n------- End of Forwarded Message%s\n\n",
+       snprintf (buffer, sizeof(buffer), "\n------- End of Forwarded Message%s\n",
                mp->numsel > 1 ? "s" : "");
     }
     write (out, buffer, strlen (buffer));