Subject: bin/13592: More stylish bin/cat
To: None <gnats-bugs@gnats.netbsd.org>
From: Petri Koistinen <thoron@mb-u04ip041.mbnet.fi>
List: netbsd-bugs
Date: 07/29/2001 21:52:13
>Number:         13592
>Category:       bin
>Synopsis:       More stylish bin/cat
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bin-bug-people
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Jul 29 11:48:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Petri Koistinen
>Release:        NetBSD-current 29-Jul-2001
>Organization:
>Environment:
System: NetBSD mb-u04ip041.mbnet.fi 1.5W NetBSD 1.5W (MUURAHAISKEKO) #5: Sat Jul 21 08:56:11 EEST 2001 thoron@legoland:/usr/src/sys/arch/amiga/compile/MUURAHAISKEKO amiga
Architecture: m68k
Machine: amiga
>Description:
	More stylistically correct bin/cat.
>How-To-Repeat:
>Fix:
Index: cat.c
===================================================================
RCS file: /cvsroot/basesrc/bin/cat/cat.c,v
retrieving revision 1.26
diff -u -r1.26 cat.c
--- cat.c	2001/01/03 14:32:40	1.26
+++ cat.c	2001/07/29 18:46:27
@@ -1,4 +1,4 @@
-/*	$NetBSD: cat.c,v 1.26 2001/01/03 14:32:40 mjl Exp $	*/
+/* $NetBSD: cat.c,v 1.26 2001/01/03 14:32:40 mjl Exp $ */
 
 /*
  * Copyright (c) 1989, 1993
@@ -54,14 +54,14 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 
-#include <locale.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <locale.h>
+#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 int bflag, eflag, fflag, nflag, sflag, tflag, vflag;
@@ -89,14 +89,14 @@
 		case 'e':
 			eflag = vflag = 1;	/* -e implies -v */
 			break;
+		case 'f':
+			fflag = 1;
+			break;
 		case 'n':
 			nflag = 1;
 			break;
 		case 's':
 			sflag = 1;
-			break;
-		case 'f':
-			fflag = 1;
 			break;
 		case 't':
 			tflag = vflag = 1;	/* -t implies -v */
>Release-Note:
>Audit-Trail:
>Unformatted: