Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/bin/ls Need to initialise the blocksize variable if the -i o...



details:   https://anonhg.NetBSD.org/src/rev/356191ea21f0
branches:  trunk
changeset: 537146:356191ea21f0
user:      simonb <simonb%NetBSD.org@localhost>
date:      Fri Sep 27 12:01:51 2002 +0000

description:
Need to initialise the blocksize variable if the -i option is used
too.  The code in display() could possibly be a bit smarter about this
requirement...

Fixes the problem in PR bin/18321 from David Laight and PR bin/18436
from FUKAUMI Naoki.

diffstat:

 bin/ls/ls.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 40aa0cd41304 -r 356191ea21f0 bin/ls/ls.c
--- a/bin/ls/ls.c       Fri Sep 27 10:08:19 2002 +0000
+++ b/bin/ls/ls.c       Fri Sep 27 12:01:51 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ls.c,v 1.44 2002/09/14 04:25:55 sommerfeld Exp $       */
+/*     $NetBSD: ls.c,v 1.45 2002/09/27 12:01:51 simonb Exp $   */
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)ls.c       8.7 (Berkeley) 8/5/94";
 #else
-__RCSID("$NetBSD: ls.c,v 1.44 2002/09/14 04:25:55 sommerfeld Exp $");
+__RCSID("$NetBSD: ls.c,v 1.45 2002/09/27 12:01:51 simonb Exp $");
 #endif
 #endif /* not lint */
 
@@ -268,7 +268,7 @@
 #endif
 
        /* If -l or -s, figure out block size. */
-       if (f_longform || f_size) {
+       if (f_inode || f_longform || f_size) {
                if (!kflag)
                        (void)getbsize(&notused, &blocksize);
                blocksize /= 512;



Home | Main Index | Thread Index | Old Index