===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mg/dired.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- src/usr.bin/mg/dired.c	2004/07/22 01:25:24	1.14
+++ src/usr.bin/mg/dired.c	2005/04/03 02:09:28	1.15
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dired.c,v 1.14 2004/07/22 01:25:24 vincent Exp $	*/
+/*	$OpenBSD: dired.c,v 1.15 2005/04/03 02:09:28 db Exp $	*/
 
 /* dired module for mg 2a	 */
 /* by Robert A. Larson		 */
@@ -30,71 +30,71 @@
 	rescan,			/* ( */
 	rescan,			/* ) */
 	rescan,			/* * */
-	d_create_directory,	/* + */
+	d_create_directory	/* + */
 };
 
 static PF dired_cmds_2[] = {
-	rescan,	/* a */
-	rescan,	/* b */
-	rescan,	/* c */
-	rescan, /* d */
-	d_findfile, /* e */
-	d_findfile, /* f */
-	rescan, /* g */
-	rescan, /* h */
-	rescan, /* i */
-	rescan, /* j */
-	rescan, /* k */
-	rescan, /* l */
-	rescan, /* m */
-	forwline, /* n */
-	d_ffotherwindow, /* o */
-	rescan, /* p */
-	rescan, /* q */
-	rescan, /* r */
-	rescan, /* s */
-	rescan, /* t */
-	rescan, /* u */
-	d_findfile, /* v */
-	rescan, /* w */
-	d_expunge, /* x */
-	rescan, /* y */
-	rescan, /* z */
+	rescan,			/* a */
+	rescan,			/* b */
+	rescan,			/* c */
+	rescan, 		/* d */
+	d_findfile, 		/* e */
+	d_findfile, 		/* f */
+	rescan, 		/* g */
+	rescan, 		/* h */
+	rescan, 		/* i */
+	rescan, 		/* j */
+	rescan, 		/* k */
+	rescan, 		/* l */
+	rescan, 		/* m */
+	forwline, 		/* n */
+	d_ffotherwindow, 	/* o */
+	rescan, 		/* p */
+	rescan, 		/* q */
+	rescan, 		/* r */
+	rescan, 		/* s */
+	rescan, 		/* t */
+	rescan, 		/* u */
+	d_findfile, 		/* v */
+	rescan, 		/* w */
+	d_expunge, 		/* x */
+	rescan, 		/* y */
+	rescan			/* z */
 };
 
 static PF dired_cmds_3[] = {
-	rescan,	/* A */
-	rescan,	/* B */
-	d_copy,	/* C */
-	d_del,	/* D */
-	rescan,	/* E */
-	rescan, /* F */
-	rescan, /* G */
-	rescan, /* H */
-	rescan, /* I */
-	rescan, /* J */
-	rescan, /* K */
-	rescan, /* L */
-	rescan, /* M */
-	rescan, /* N */
-	rescan, /* O */
-	rescan, /* P */
-	rescan, /* Q */
-	d_rename, /* R */
-	rescan, /* S */
-	rescan, /* T */
-	rescan, /* U */
-	d_findfile, /* V */
-	rescan, /* W */
-	d_expunge, /* X */
-	rescan, /* Y */
-	rescan, /* Z */
+	rescan,			/* A */
+	rescan,			/* B */
+	d_copy,			/* C */
+	d_del,			/* D */
+	rescan,			/* E */
+	rescan, 		/* F */
+	rescan, 		/* G */
+	rescan, 		/* H */
+	rescan, 		/* I */
+	rescan, 		/* J */
+	rescan, 		/* K */
+	rescan, 		/* L */
+	rescan, 		/* M */
+	rescan, 		/* N */
+	rescan, 		/* O */
+	rescan, 		/* P */
+	rescan, 		/* Q */
+	d_rename, 		/* R */
+	rescan, 		/* S */
+	rescan, 		/* T */
+	rescan, 		/* U */
+	d_findfile, 		/* V */
+	rescan, 		/* W */
+	d_expunge, 		/* X */
+	rescan, 		/* Y */
+	rescan			/* Z */
 };
 
 static PF dired_pf[] = {
-	d_findfile,	/* ^M */
-	rescan,		/* ^N */
-	d_findfile,	/* ^O */
+	d_findfile,		/* ^M */
+	rescan,			/* ^N */
+	d_findfile		/* ^O */
 };
 
 static struct KEYMAPE (4 + IMAPEXT) diredmap = {
@@ -114,9 +114,9 @@
 int
 dired(int f, int n)
 {
-	static int inited = 0;
-	char	dirname[NFILEN], *bufp;
-	BUFFER *bp;
+	static int   inited = 0;
+	char	     dirname[NFILEN], *bufp;
+	BUFFER	    *bp;
 
 	if (inited == 0) {
 		maps_add((KEYMAP *)&diredmap, "dired");
@@ -125,35 +125,35 @@
 
 	dirname[0] = '\0';
 	if ((bufp = eread("Dired: ", dirname, NFILEN, EFNEW | EFCR)) == NULL)
-		return ABORT;
+		return (ABORT);
 	if ((bp = dired_(bufp)) == NULL)
-		return FALSE;
+		return (FALSE);
 	bp->b_modes[0] = name_mode("fundamental");
 	bp->b_modes[1] = name_mode("dired");
 	bp->b_nmodes = 1;
 	curbp = bp;
-	return showbuffer(bp, curwp, WFHARD | WFMODE);
+	return (showbuffer(bp, curwp, WFHARD | WFMODE));
 }
 
 /* ARGSUSED */
 int
 d_otherwindow(int f, int n)
 {
-	char	dirname[NFILEN], *bufp;
+	char	 dirname[NFILEN], *bufp;
 	BUFFER	*bp;
 	MGWIN	*wp;
 
 	dirname[0] = '\0';
 	if ((bufp = eread("Dired other window: ", dirname, NFILEN,
 	    EFNEW | EFCR)) == NULL)
-		return ABORT;
+		return (ABORT);
 	if ((bp = dired_(bufp)) == NULL)
-		return FALSE;
+		return (FALSE);
 	if ((wp = popbuf(bp)) == NULL)
-		return FALSE;
+		return (FALSE);
 	curbp = bp;
 	curwp = wp;
-	return TRUE;
+	return (TRUE);
 }
 
 /* ARGSUSED */
@@ -161,7 +161,7 @@
 d_del(int f, int n)
 {
 	if (n < 0)
-		return FALSE;
+		return (FALSE);
 	while (n--) {
 		if (llength(curwp->w_dotp) > 0)
 			lputc(curwp->w_dotp, 0, 'D');
@@ -170,7 +170,7 @@
 	}
 	curwp->w_flag |= WFEDIT | WFMOVE;
 	curwp->w_doto = 0;
-	return TRUE;
+	return (TRUE);
 }
 
 /* ARGSUSED */
@@ -178,7 +178,7 @@
 d_undel(int f, int n)
 {
 	if (n < 0)
-		return d_undelbak(f, -n);
+		return (d_undelbak(f, -n));
 	while (n--) {
 		if (llength(curwp->w_dotp) > 0)
 			lputc(curwp->w_dotp, 0, ' ');
@@ -187,7 +187,7 @@
 	}
 	curwp->w_flag |= WFEDIT | WFMOVE;
 	curwp->w_doto = 0;
-	return TRUE;
+	return (TRUE);
 }
 
 /* ARGSUSED */
@@ -195,7 +195,7 @@
 d_undelbak(int f, int n)
 {
 	if (n < 0)
-		return d_undel(f, -n);
+		return (d_undel(f, -n));
 	while (n--) {
 		if (llength(curwp->w_dotp) > 0)
 			lputc(curwp->w_dotp, 0, ' ');
@@ -204,31 +204,31 @@
 	}
 	curwp->w_doto = 0;
 	curwp->w_flag |= WFEDIT | WFMOVE;
-	return TRUE;
+	return (TRUE);
 }
 
 /* ARGSUSED */
 int
 d_findfile(int f, int n)
 {
-	BUFFER *bp;
-	int	s;
-	char	fname[NFILEN];
+	BUFFER	*bp;
+	int	 s;
+	char	 fname[NFILEN];
 
-	if ((s = d_makename(curwp->w_dotp, fname, sizeof fname)) == ABORT)
-		return FALSE;
+	if ((s = d_makename(curwp->w_dotp, fname, sizeof(fname))) == ABORT)
+		return (FALSE);
 	if (s == TRUE)
 		bp = dired_(fname);
 	else
 		bp = findbuffer(fname);
 	if (bp == NULL)
-		return FALSE;
+		return (FALSE);
 	curbp = bp;
 	if (showbuffer(bp, curwp, WFHARD) != TRUE)
-		return FALSE;
+		return (FALSE);
 	if (bp->b_fname[0] != 0)
-		return TRUE;
-	return readin(fname);
+		return (TRUE);
+	return (readin(fname));
 }
 
 /* ARGSUSED */
@@ -240,17 +240,17 @@
 	BUFFER *bp;
 	MGWIN  *wp;
 
-	if ((s = d_makename(curwp->w_dotp, fname, sizeof fname)) == ABORT)
-		return FALSE;
+	if ((s = d_makename(curwp->w_dotp, fname, sizeof(fname))) == ABORT)
+		return (FALSE);
 	if ((bp = (s ? dired_(fname) : findbuffer(fname))) == NULL)
-		return FALSE;
+		return (FALSE);
 	if ((wp = popbuf(bp)) == NULL)
-		return FALSE;
+		return (FALSE);
 	curbp = bp;
 	curwp = wp;
 	if (bp->b_fname[0] != 0)
-		return TRUE;	/* never true for dired buffers */
-	return readin(fname);
+		return (TRUE);	/* never true for dired buffers */
+	return (readin(fname));
 }
 
 /* ARGSUSED */
@@ -258,27 +258,27 @@
 d_expunge(int f, int n)
 {
 	LINE	*lp, *nlp;
-	char	fname[NFILEN];
+	char	 fname[NFILEN];
 
 	for (lp = lforw(curbp->b_linep); lp != curbp->b_linep; lp = nlp) {
 		nlp = lforw(lp);
 		if (llength(lp) && lgetc(lp, 0) == 'D') {
-			switch (d_makename(lp, fname, sizeof fname)) {
+			switch (d_makename(lp, fname, sizeof(fname))) {
 			case ABORT:
 				ewprintf("Bad line in dired buffer");
-				return FALSE;
+				return (FALSE);
 			case FALSE:
 				if (unlink(fname) < 0) {
 					ewprintf("Could not delete '%s'",
 					    basename(fname));
-					return FALSE;
+					return (FALSE);
 				}
 				break;
 			case TRUE:
 				if (rmdir(fname) < 0) {
 					ewprintf("Could not delete directory '%s'",
 					    basename(fname));
-					return FALSE;
+					return (FALSE);
 				}
 				break;
 			}
@@ -286,10 +286,9 @@
 			curwp->w_flag |= WFHARD;
 		}
 	}
-	return TRUE;
+	return (TRUE);
 }
 
-
 /* ARGSUSED */
 int
 d_copy(int f, int n)
@@ -299,20 +298,20 @@
 	int	off;
 	BUFFER *bp;
 
-	if (d_makename(curwp->w_dotp, frname, sizeof frname) != FALSE) {
+	if (d_makename(curwp->w_dotp, frname, sizeof(frname)) != FALSE) {
 		ewprintf("Not a file");
-		return FALSE;
+		return (FALSE);
 	}
-	off = strlcpy(toname, curbp->b_fname, sizeof toname);
-	if (off >= sizeof toname - 1) {	/* can't happen, really */
+	off = strlcpy(toname, curbp->b_fname, sizeof(toname));
+	if (off >= sizeof(toname) - 1) {	/* can't happen, really */
 		ewprintf("too long directory name");
 		return (FALSE);
 	}
-	if ((bufp = eread("Copy %s to: ", toname + off, sizeof toname - off,
+	if ((bufp = eread("Copy %s to: ", toname + off, sizeof(toname) - off,
 	    EFNEW | EFCR, basename(frname))) == NULL)
-		return ABORT;
+		return (ABORT);
 	else if (bufp[0] == '\0')
-		return NULL;
+		return (NULL);
 	stat = (copy(frname, toname) >= 0) ? TRUE : FALSE;
 	if (stat != TRUE)
 		return (stat);
@@ -328,20 +327,20 @@
 	int	stat, off;
 	BUFFER *bp;
 
-	if (d_makename(curwp->w_dotp, frname, sizeof frname) != FALSE) {
+	if (d_makename(curwp->w_dotp, frname, sizeof(frname)) != FALSE) {
 		ewprintf("Not a file");
-		return FALSE;
+		return (FALSE);
 	}
-	off = strlcpy(toname, curbp->b_fname, sizeof toname);
-	if (off >= sizeof toname - 1) {	/* can't happen, really */
+	off = strlcpy(toname, curbp->b_fname, sizeof(toname));
+	if (off >= sizeof(toname) - 1) {	/* can't happen, really */
 		ewprintf("too long directory name");
 		return (FALSE);
 	}
 	if ((bufp = eread("Rename %s to: ", toname + off,
-	    sizeof toname - off, EFNEW | EFCR, basename(frname))) == NULL)
-		return ABORT;
+	    sizeof(toname) - off, EFNEW | EFCR, basename(frname))) == NULL)
+		return (ABORT);
 	else if (bufp[0] == '\0')
-		return FALSE;
+		return (FALSE);
 	stat = (rename(frname, toname) >= 0) ? TRUE : FALSE;
 	if (stat != TRUE)
 		return (stat);
@@ -353,8 +352,8 @@
 void
 reaper(int signo __attribute__((unused)))
 {
-	pid_t ret;
-	int status;
+	pid_t	ret;
+	int	status;
 
 	while ((ret = waitpid(-1, &status, WNOHANG)) >= 0)
 		;
@@ -366,25 +365,25 @@
 int
 d_shell_command(int f, int n)
 {
-	char command[512], fname[MAXPATHLEN], buf[BUFSIZ], *bufp, *cp;
-	int infd, fds[2];
-	pid_t pid;
-	struct sigaction olda, newa;
-	BUFFER *bp;
-	MGWIN *wp;
-	FILE *fin;
+	char	 command[512], fname[MAXPATHLEN], buf[BUFSIZ], *bufp, *cp;
+	int	 infd, fds[2];
+	pid_t	 pid;
+	struct	 sigaction olda, newa;
+	BUFFER	*bp;
+	MGWIN	*wp;
+	FILE	*fin;
 
 	bp = bfind("*Shell Command Output*", TRUE);
 	if (bclear(bp) != TRUE)
 		return (ABORT);
 
-	if (d_makename(curwp->w_dotp, fname, sizeof fname) != FALSE) {
+	if (d_makename(curwp->w_dotp, fname, sizeof(fname)) != FALSE) {
 		ewprintf("bad line");
 		return (ABORT);
 	}
 
 	command[0] = '\0';
-	if ((bufp = eread("! on %s: ", command, sizeof command, 0,
+	if ((bufp = eread("! on %s: ", command, sizeof(command), 0,
 	    basename(fname))) == NULL)
 		return (ABORT);
 	infd = open(fname, O_RDONLY);
@@ -424,7 +423,7 @@
 		fin = fdopen(fds[0], "r");
 		if (fin == NULL)	/* "r" is surely a valid mode! */
 			panic("can't happen");
-		while (fgets(buf, sizeof buf, fin) != NULL) {
+		while (fgets(buf, sizeof(buf), fin) != NULL) {
 			cp = strrchr(buf, '\n');
 			if (cp == NULL && !feof(fin)) {	/* too long a line */
 				int c;
@@ -453,18 +452,18 @@
 int
 d_create_directory(int f, int n)
 {
-	char tocreate[MAXPATHLEN], *bufp;
-	ssize_t off;
-	BUFFER *bp;
+	char	 tocreate[MAXPATHLEN], *bufp;
+	ssize_t  off;
+	BUFFER	*bp;
 
-	off = strlcpy(tocreate, curbp->b_fname, sizeof tocreate);
-	if (off >= sizeof tocreate - 1)
+	off = strlcpy(tocreate, curbp->b_fname, sizeof(tocreate));
+	if (off >= sizeof(tocreate) - 1)
 		return (FALSE);
 	if ((bufp = ereply("Create directory: ", tocreate + off,
-	    sizeof tocreate - off)) == NULL)
+	    sizeof(tocreate) - off)) == NULL)
 		return (ABORT);
 	else if (bufp[0] == '\0')
-		return FALSE;
+		return (FALSE);
 	if (mkdir(tocreate, 0755) == -1) {
 		ewprintf("Creating directory: %s, %s", strerror(errno),
 		    tocreate);