Cosmetic changes.

[mmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 79f7c6f..bd40904 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -688,12 +688,6 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 
        default:
                if ((status = pidwait(pid, NOTOK))) {
-#ifdef ATTVIBUG
-                       if ((cp = mhbasename(*ed)) && strcmp(cp, "vi") == 0 &&
-                                       (status & 0x00ff) == 0)
-                               status = 0;
-                       else {
-#endif
                        if (((status & 0xff00) != 0xff00)
                                && (!reedit || (status & 0x00ff))) {
                                if (!use && (status & 0xff00) && (rename(file, cp = m_backup (file)) != NOTOK)) {
@@ -704,9 +698,6 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
                        }
                        status = -2;  /* maybe "reedit ? -2 : -1"? */
                        break;
-#ifdef ATTVIBUG
-                       }
-#endif
                }
 
                reedit++;
@@ -793,6 +784,8 @@ sendfile(char **arg, char *file, int pushsw)
                return 1;
        }
 
+       /* some different sendproc */
+
        context_save();  /* save the context file */
        fflush(stdout);
 
@@ -801,6 +794,7 @@ sendfile(char **arg, char *file, int pushsw)
        switch (child_id) {
        case NOTOK:
                advise(NULL, "unable to fork, so sending directly...");
+               /* fall */
        case OK:
                vecp = 0;
                vec[vecp++] = invo_name;
@@ -846,23 +840,19 @@ static struct swit  sendswitches[] = {
        { "push", 0 },
 #define NSPSHSW  9
        { "nopush", 0 },
-#define UNIQSW  10
-       { "unique", -6 },
-#define NUNIQSW  11
-       { "nounique", -8 },
-#define VERBSW  12
+#define VERBSW  10
        { "verbose", 0 },
-#define NVERBSW  13
+#define NVERBSW  11
        { "noverbose", 0 },
-#define WATCSW  14
+#define WATCSW  12
        { "watch", 0 },
-#define NWATCSW  15
+#define NWATCSW  13
        { "nowatch", 0 },
-#define WIDTHSW  16
+#define WIDTHSW  14
        { "width columns", 0 },
-#define SVERSIONSW  17
+#define SVERSIONSW  15
        { "version", 0 },
-#define SHELPSW  18
+#define SHELPSW  16
        { "help", 0 },
        { NULL, 0 }
 };
@@ -872,7 +862,6 @@ extern int debugsw;  /* from sendsbr.c */
 extern int forwsw;
 extern int inplace;
 extern int pushsw;
-extern int unique;
 extern int verbsw;
 
 extern char *altmsg;  /*  .. */
@@ -922,13 +911,12 @@ sendit(char *sp, char **arg, char *file, int pushed)
        ** Merge any arguments from command line (now in vec)
        ** and arguments from profile.
        */
-       arguments = getarguments (sp, n, vec, 1);
+       arguments = getarguments(sp, n, vec, 1);
        argp = arguments;
 
        debugsw = 0;
        forwsw = 1;
        inplace = 1;
-       unique = 0;
 
        altmsg = NULL;
        annotext = NULL;
@@ -964,12 +952,6 @@ sendit(char *sp, char **arg, char *file, int pushed)
                                pushed = 0;
                                continue;
 
-                       case UNIQSW:
-                               unique++;
-                               continue;
-                       case NUNIQSW:
-                               unique = 0;
-                               continue;
                        case FORWSW:
                                forwsw++;
                                continue;
@@ -1021,7 +1003,7 @@ sendit(char *sp, char **arg, char *file, int pushed)
                dp = getcpy(cp);
                for (ap = brkstring(dp, " ", "\n"); ap && *ap; ap++) {
                        vec[vecp++] = "-alias";
-                       vec[vecp++] = *ap;
+                       vec[vecp++] = getcpy(etcpath(*ap));
                }
        }