diff options
| author | Kevin Chase <kevincha99@hotmail.com> | 2012-04-07 10:15:52 -0700 |
|---|---|---|
| committer | Kevin Chase <kevincha99@hotmail.com> | 2012-04-07 10:15:52 -0700 |
| commit | 49861be1f28e95add07069ea54defa5dd77e742d (patch) | |
| tree | 0d0088fd717be402e4457611f4cac8686e0c766a | |
| parent | 0392c177d0f21a8916e4a6835454411d15fe5a9c (diff) | |
| download | toybox-49861be1f28e95add07069ea54defa5dd77e742d.tar.gz toybox-49861be1f28e95add07069ea54defa5dd77e742d.tar.bz2 toybox-49861be1f28e95add07069ea54defa5dd77e742d.zip | |
Replace ?: gcc extension with standard code
| -rw-r--r-- | toys/df.c | 2 | ||||
| -rw-r--r-- | toys/toysh.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -71,7 +71,7 @@ static void show_mt(struct mtab_list *mt) // 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); diff --git a/toys/toysh.c b/toys/toysh.c index 23b88c3..365c47f 100644 --- a/toys/toysh.c +++ b/toys/toysh.c @@ -372,7 +372,7 @@ void toysh_main(void) 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); } |