X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0bfb53a23531bea3aaeadcd1a6f6c372eef96612..7711f3fc00259e55f630cfe6104eff3083dc9d77:/uip/repl.c

diff --git a/uip/repl.c b/uip/repl.c
index e8d64907..a9f03b3e 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -17,7 +17,7 @@
     X("annotate", 0, ANNOSW) \
     X("noannotate", 0, NANNOSW) \
     X("cc all|to|cc|me", 0, CCSW) \
-    X("nocc type", 0, NCCSW) \
+    X("nocc all|to|cc|me", 0, NCCSW) \
     X("draftfolder +folder", 0, DFOLDSW) \
     X("draftmessage msg", 0, DMSGSW) \
     X("nodraftfolder", 0, NDFLDSW) \
@@ -96,19 +96,19 @@ short cccc = -1;
 short ccme = -1;
 short querysw = 0;
 
-short outputlinelen = OUTPUTLINELEN;
-short groupreply = 0;		/* Is this a group reply?        */
+static short outputlinelen = OUTPUTLINELEN;
+static short groupreply = 0;		/* Is this a group reply?        */
 
-int mime = 0;			/* include original as MIME part */
-char *form   = NULL;		/* form (components) file        */
-char *filter = NULL;		/* message filter file           */
-char *fcc    = NULL;		/* folders to add to Fcc: header */
+static int mime = 0;			/* include original as MIME part */
+static char *form   = NULL;		/* form (components) file        */
+static char *filter = NULL;		/* message filter file           */
+static char *fcc    = NULL;		/* folders to add to Fcc: header */
 
 
 /*
  * prototypes
  */
-void docc (char *, int);
+static void docc (char *, int);
 
 
 int
@@ -129,13 +129,7 @@ main (int argc, char **argv)
 
     int buildsw = 0;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -386,7 +380,7 @@ try_it_again:
 	    adios (maildir, "unable to change directory to");
 
 	/* read folder and create message structure */
-	if (!(mp = folder_read (folder)))
+	if (!(mp = folder_read (folder, 1)))
 	    adios (NULL, "unable to read folder %s", folder);
 
 	/* check for empty folder */