refile: Never change the current folder

[mmh] / uip / distsbr.c

diff --git a/uip/distsbr.c b/uip/distsbr.c
index cf668ad..a600b77 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -25,10 +25,10 @@ int
 distout(char *drft, char *msgnam, char *backup)
 {
        int state;
-       register unsigned char *dp;
-       register char *resent;
+       unsigned char *dp;
+       char *resent;
        char name[NAMESZ], buffer[BUFSIZ];
-       register FILE *ifp, *ofp;
+       FILE *ifp, *ofp;
 
        strcpy(backup, m_mktemp(toabsdir(invo_name), NULL, NULL));
        if (rename(drft, backup) == NOTOK) {
@@ -59,7 +59,6 @@ distout(char *drft, char *msgnam, char *backup)
                                ifp)) {
                case FLD:
                case FLDPLUS:
-               case FLDEOF:
                        if (!uprf(name, "resent")) {
                                advise(NULL, "Please re-edit draft to remove the ``%s'' header.", name);
                                goto leave_bad;
@@ -75,13 +74,9 @@ distout(char *drft, char *msgnam, char *backup)
                                resent = add(buffer, resent);
                                fputs(buffer, ofp);
                        }
-                       if (state == FLDEOF) {
-                               goto process;
-                       }
                        break;
 
                case BODY:
-               case BODYEOF:
                        for (dp = buffer; *dp; dp++) {
                                if (!isspace(*dp)) {
                                        advise(NULL, "Please re-edit draft to consist of headers only.");
@@ -123,7 +118,7 @@ process: ;
                }
                return NOTOK;
        }
-       free(resent);
+       mh_free0(&resent);
 
        if (txtfd != NOTOK) {
                lseek(txtfd, (off_t) 0, SEEK_SET);  /* msgnam not accurate */
@@ -141,7 +136,7 @@ ready_msg(char *msgnam)
 {
        int state, out;
        char name[NAMESZ], buffer[BUFSIZ], tmpfil[BUFSIZ];
-       register FILE *ifp, *ofp;
+       FILE *ifp, *ofp;
        char *cp = NULL;
 
        if (hdrfd != NOTOK) {
@@ -176,7 +171,6 @@ ready_msg(char *msgnam)
                switch (state) {
                case FLD:
                case FLDPLUS:
-               case FLDEOF:
                        if (uprf(name, "resent")) {
                                fprintf(ofp, "Prev-");
                        }
@@ -186,13 +180,9 @@ ready_msg(char *msgnam)
                                                sizeof buffer, ifp);
                                fputs(buffer, ofp);
                        }
-                       if (state == FLDEOF) {
-                               goto process;
-                       }
                        break;
 
                case BODY:
-               case BODYEOF:
                        fclose(ofp);
 
                        cp = m_mktemp2(NULL, "dist", &txtfd, NULL);