o Removed two unused variables (f_dirname and f_newline) in ls.c

o Added the -H and -P options for treatment of symbolic links.

o Removed the #ifdef BSD4_4_LITE, since it does not seem to do anything
  useful

o Fixed up prn_octal() so its output looks more like that of AT&T Unices
  when -b is given.

The next two lines apply only to the first two changes above:

PR:		bin/6140
Submitted by:	Max Euston

1 files changed, 5 insertions, 16 deletions

diff --git a/bin/ls/util.c b/bin/ls/util.c
index f72ef6c..3d16088 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-	"$Id: util.c,v 1.12 1998/04/21 22:02:01 des Exp $";
+	"$Id: util.c,v 1.13 1998/04/24 07:49:51 des Exp $";
 #endif
 #endif /* not lint */
 
@@ -103,22 +103,14 @@ prn_octal(s)
 	
         while ((ch = *s++))
 	{
-	        if (isprint(ch)) putchar(ch), len++;
+	        if (isprint(ch) && (ch != '\"') && (ch != '\\'))
+		        putchar(ch), len++;
 	        else if (f_octal_escape) {
 	                putchar('\\');
 		        switch (ch) {
-		        case 0:
-			        putchar('0');
-				break;
 			case '\\':
 			        putchar('\\');
 				break;
-			case '\?':
-			        putchar('?');
-				break;
-			case '\'':
-			        putchar('\'');
-				break;
 			case '\"':
 			        putchar('"');
 				break;
@@ -166,10 +158,7 @@ prn_octal(s)
 void
 usage()
 {
-#ifdef BSD4_4_LITE
-	(void)fprintf(stderr, "usage: ls [-1ACFLRTacdfiklqrstu] [file ...]\n");
-#else
-	(void)fprintf(stderr, "usage: ls [-ACFLRTWacdfgikloqrstu1] [file ...]\n");
-#endif
+	(void)fprintf(stderr, "usage: ls [-?ACFHLPRTWacdfgikloqrstu1]"
+		      " [file ...]\n");
 	exit(1);
 }