X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;fp=uip%2Fwhatnowsbr.c;h=aefe67f54b00f7905bb2976c57a6fa9ca82ef1b7;hp=032566e2291f28d857b44db1024355129467e988;hb=7e3bc577e84e13a47005a706718bd6ec0e6a0e0a;hpb=246ca516a0f7b870316116bc184347b0fb2bc00b

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 032566e..aefe67f 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -128,7 +128,7 @@ WhatNow(int argc, char **argv)
 	char buf[BUFSIZ], prompt[BUFSIZ];
 	char **argp, **arguments;
 	struct stat st;
-	char *attach = (char *)0;  /* attachment header field name */
+	char *attach = NULL;  /* attachment header field name */
 	char cwd[MAXPATHLEN + 1];  /* current working directory */
 	char file[MAXPATHLEN + 1];  /* file name buffer */
 	char shell[MAXPATHLEN + 1];  /* shell response buffer */
@@ -148,7 +148,7 @@ WhatNow(int argc, char **argv)
 	** Get the initial current working directory.
 	*/
 
-	if (getcwd(cwd, sizeof (cwd)) == (char *)0) {
+	if (getcwd(cwd, sizeof (cwd)) == NULL) {
 		adios("getcwd", "could not get working directory");
 	}
 
@@ -188,7 +188,7 @@ WhatNow(int argc, char **argv)
 				continue;
 
 			case ATTACHSW:
-				if (attach != (char *)0)
+				if (attach != NULL)
 					adios(NULL, "only one attachment header field name at a time!");
 				if (!(attach = *argp++) || *attach == '-')
 					adios(NULL, "missing argument to %s",
@@ -300,7 +300,7 @@ WhatNow(int argc, char **argv)
 			** the absolute path.
 			*/
 
-			if (*(argp+1) == (char *)0) {
+			if (*(argp+1) == NULL) {
 				sprintf(buf, "$SHELL -c \"cd;pwd\"");
 			} else {
 				writesomecmd(buf, BUFSIZ, "cd", "pwd", argp);
@@ -308,7 +308,7 @@ WhatNow(int argc, char **argv)
 			if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
 				fgets(cwd, sizeof (cwd), f);
 
-				if (strchr(cwd, '\n') != (char *)0)
+				if (strchr(cwd, '\n') != NULL)
 						*strchr(cwd, '\n') = '\0';
 
 				pclose(f);
@@ -344,15 +344,15 @@ WhatNow(int argc, char **argv)
 			** -n    numbers listing
 			*/
 
-			if (attach == (char *)0) {
-				advise((char *)0, "can't list because no header field name was given.");
+			if (attach == NULL) {
+				advise(NULL, "can't list because no header field name was given.");
 				break;
 			}
 
-			l = (char *)0;
+			l = NULL;
 			n = 0;
 
-			while (*++argp != (char *)0) {
+			while (*++argp != NULL) {
 				if (strcmp(*argp, "-l") == 0)
 					l = "/";
 
@@ -370,7 +370,7 @@ WhatNow(int argc, char **argv)
 			}
 
 			if (n == -1)
-				advise((char *)0, "usage is alist [-ln].");
+				advise(NULL, "usage is alist [-ln].");
 
 			else
 				annolist(drft, attach, l, n);
@@ -382,13 +382,13 @@ WhatNow(int argc, char **argv)
 			** Attach files to current draft.
 			*/
 
-			if (attach == (char *)0) {
-				advise((char *)0, "can't attach because no header field name was given.");
+			if (attach == NULL) {
+				advise(NULL, "can't attach because no header field name was given.");
 				break;
 			}
 
-			if (*(argp+1) == (char *)0) {
-				advise((char *)0, "attach command requires file argument(s).");
+			if (*(argp+1) == NULL) {
+				advise(NULL, "attach command requires file argument(s).");
 				break;
 			}
 
@@ -412,7 +412,7 @@ WhatNow(int argc, char **argv)
 
 			if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
 				while (fgets(shell, sizeof (shell), f)
-						!= (char *)0) {
+						!= NULL) {
 					*(strchr(shell, '\n')) = '\0';
 
 					if (*shell == '/')
@@ -438,8 +438,8 @@ WhatNow(int argc, char **argv)
 			** Detach files from current draft.
 			*/
 
-			if (attach == (char *)0) {
-				advise((char *)0, "can't detach because no header field name was given.");
+			if (attach == NULL) {
+				advise(NULL, "can't detach because no header field name was given.");
 				break;
 			}
 
@@ -450,7 +450,7 @@ WhatNow(int argc, char **argv)
 			*/
 
 			for (n = 0, arguments = argp + 1;
-					*arguments != (char *)0;
+					*arguments != NULL;
 					arguments++) {
 				if (strcmp(*arguments, "-n") == 0) {
 						n = 1;
@@ -468,7 +468,7 @@ WhatNow(int argc, char **argv)
 
 			if (n == 1) {
 				for (arguments = argp + 1;
-						*arguments != (char *)0;
+						*arguments != NULL;
 						arguments++) {
 					if (strcmp(*arguments, "-n") == 0)
 						continue;
@@ -478,7 +478,7 @@ WhatNow(int argc, char **argv)
 						annotate(drft, attach, NULL,
 								1, 0, n, 1);
 
-						for (argp = arguments + 1; *argp != (char *)0; argp++) {
+						for (argp = arguments + 1; *argp != NULL; argp++) {
 							if (atoi(*argp) > n) {
 								if (atoi(*argp) == 1)
 									*argp = "";
@@ -555,15 +555,15 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
 	*/
 	int trailln = strlen(trailcmd) + 3;
 	if (ln < 0 || ln + trailln > bufsz)
-		adios((char *)0, "arguments too long");
+		adios(NULL, "arguments too long");
 
 	cp = buf + ln;
 
-	while (*++argp != (char *)0) {
+	while (*++argp != NULL) {
 		ln = strlen(*argp);
 		/* +1 for leading space */
 		if (ln + trailln + 1 > bufsz - (cp-buf))
-			adios((char *)0, "arguments too long");
+			adios(NULL, "arguments too long");
 		*cp++ = ' ';
 		memcpy(cp, *argp, ln+1);
 		cp += ln;
@@ -1072,7 +1072,7 @@ sendit(char *sp, char **arg, char *file, int pushed)
 	char *cp, buf[BUFSIZ], **argp;
 	char **arguments, *vec[MAXARGS];
 	struct stat st;
-	char *attach = (char *)0;  /* attachment header field name */
+	char *attach = NULL;  /* attachment header field name */
 	int attachformat = 0;  /* mhbuild format specifier for attachments */
 
 #ifndef lint