Mercurial > hg > toybox
changeset 560:979c5ab6f0c2
Replace ?: gcc extension with standard code
author | Kevin Chase <kevincha99@hotmail.com> |
---|---|
date | Sat, 07 Apr 2012 10:15:52 -0700 |
parents | 120b3dde7cf4 |
children | c97e338a4126 |
files | toys/df.c toys/toysh.c |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/toys/df.c Mon Apr 09 13:31:44 2012 +0200 +++ b/toys/df.c Sat Apr 07 10:15:52 2012 -0700 @@ -71,7 +71,7 @@ // Figure out how much total/used/free space this filesystem has, // forcing 64-bit math because filesystems are big now. - block = mt->statvfs.f_bsize ? : 1; + block = mt->statvfs.f_bsize ? mt->statvfs.f_bsize : 1; size = (long)((block * mt->statvfs.f_blocks) / TT.units); used = (long)((block * (mt->statvfs.f_blocks-mt->statvfs.f_bfree)) / TT.units);
--- a/toys/toysh.c Mon Apr 09 13:31:44 2012 +0200 +++ b/toys/toysh.c Sat Apr 07 10:15:52 2012 -0700 @@ -372,7 +372,7 @@ for (;;) { char *command = 0; if (!f) xputc('$'); - if (1 > getline(&command, &cmdlen, f ? : stdin)) break; + if (1 > getline(&command, &cmdlen, f ? f : stdin)) break; handle(command); free(command); }