X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmshcmds.c;h=63ee99c85b8b98ee12556f5beabffd0a820039e7;hp=13ad35622c3f5136baa8f6d45efbfbc9f54ae838;hb=1513f7668c494c4583141d6115669b7198c14556;hpb=8563731b02ce9d750806f6b1769af8b399d964e8

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index 13ad356..63ee99c 100644
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -3,6 +3,10 @@
  * mshcmds.c -- command handlers in msh
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
@@ -10,15 +14,15 @@
 #include <h/dropsbr.h>
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
-#include <zotnet/tws/tws.h>
-#include <zotnet/mts/mts.h>
+#include <h/tws.h>
+#include <h/mts.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <h/msh.h>
 #include <h/picksbr.h>
+#include <h/utils.h>
 
-extern int errno;
 
 static char delim3[] = "-------";	/* from burst.c */
 
@@ -139,7 +143,7 @@ static struct swit distswit[] = {
 #define	DINWTSW                  11
     { "nowhatnowproc", 0 },
 #define	DIHELP                   12
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -240,7 +244,7 @@ static struct swit explswit[] = {
 #define	EXNVBSW        5
     { "noverbose", 0 },
 #define	EXHELP	       6
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -469,7 +473,7 @@ static struct swit fileswit[] = {
 #define	FINPRC               8
     { "normmproc", 0 },
 #define	FIHELP               9
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -633,7 +637,7 @@ static struct swit foldswit[] = {
 #define	FLLISW        14
     { "list", 0 },
 #define	FLHELP        15
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -852,7 +856,7 @@ static struct swit forwswit[] = {
 #define	FONWTSW                 16
     { "nowhatnow", 0 },
 #define	FOHELP                  17
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -1120,7 +1124,7 @@ static struct swit markswit[] = {
 #define	MNZERSW            7
     { "nozero", 0 },
 #define	MHELP              8
-    { "help", 4 },
+    { "help", 0 },
 #define	MDBUGSW            9
     { "debug", -5 },
     { NULL, 0 }
@@ -1339,7 +1343,7 @@ static struct swit mhnswit[] = {
 #define	MHNNVERBSW	   23
     { "noverbose", 0 },
 #define	MHNHELPSW	   24
-    { "help", 4 },
+    { "help", 0 },
 #define	MHNPROGSW	   25
     { "moreproc program", -4 },
 #define	MHNNPROGSW	   26
@@ -1454,7 +1458,7 @@ static struct swit packswit[] = {
 #define	PAFISW         0
     { "file name", 0 },
 #define	PAHELP         1
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -1632,7 +1636,7 @@ static struct swit pickswit[] = {
 #define	PINLISW              21
     { "nolist", 0 },
 #define	PIHELP               22
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -1819,7 +1823,7 @@ static struct swit replswit[] = {
 #define	REWIDSW                19
     { "width columns", 0 },
 #define	REHELP                 20
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -1915,7 +1919,7 @@ replcmd (char **args)
 
 static struct swit rmmswit[] = {
 #define	RMHELP    0
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -2044,7 +2048,7 @@ static struct swit scanswit[] = {
 #define	SCWID              6
     { "width columns", 0 },
 #define	SCHELP             7
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -2157,8 +2161,7 @@ scancmd (char **args)
 		if (*dp == '\\' || *dp == '"' || *dp == '\n')
 		    i++;
 	    i++;
-	    if ((ep = malloc ((unsigned) i)) == NULL)
-		adios (NULL, "out of memory");
+	    ep = mh_xmalloc ((unsigned) i);
 	    for (dp = nfs, fp = ep; *dp; dp++) {
 		if (*dp == '\n') {
 		    *fp++ = '\\', *fp++ = 'n';
@@ -2294,7 +2297,7 @@ static struct swit showswit[] = {
 #define SHNHEAD               9
     { "noheader", 3 },
 #define	SHHELP               10
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -2387,7 +2390,6 @@ showcmd (char **args)
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
 	    if (is_selected (mp, msgnum) && is_nontext (msgnum)) {
 		proc = showmimeproc;
-		vec[vecp++] = "-show";
 		vec[vecp++] = "-file";
 		vec[vecp] = NULL;
 		goto finish;
@@ -2726,7 +2728,7 @@ static struct swit sortswit[] = {
 #define	SONVERB              6
     { "noverbose", 0 },
 #define	SOHELP               7
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -3006,7 +3008,6 @@ process (int msgnum, char *proc, int vecp, char **vec)
     strncpy (tmpfil, m_scratch ("", invo_name), sizeof(tmpfil));
     if ((out = fopen (tmpfil, "w")) == NULL) {
 	int olderr;
-	extern int errno;
 	char newfil[80];
 
 	olderr = errno;