summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenys Vlasenko2010-07-25 00:13:27 +0200
committerDenys Vlasenko2010-07-25 00:13:27 +0200
commit503a07cab24a1e58099a04970babd2b761469449 (patch)
treef96b01fd405adcbcbeed0086389da27bd1a07ccc /coreutils
parentb2d95147c989448f23cc59c63b83e2d89f0bd9cd (diff)
downloadbusybox-503a07cab24a1e58099a04970babd2b761469449.zip
busybox-503a07cab24a1e58099a04970babd2b761469449.tar.gz
Apply post-1.17.0 fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/dos2unix.c2
-rw-r--r--coreutils/realpath.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 1911f53..e06ecc4 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -92,7 +92,7 @@ int dos2unix_main(int argc UNUSED_PARAM, char **argv)
do {
/* might be convert(NULL) if there is no filename given */
convert(*argv, conv_type);
- } while (*++argv);
+ } while (*argv && *++argv);
return 0;
}
diff --git a/coreutils/realpath.c b/coreutils/realpath.c
index 90a71ed..3bc40ee 100644
--- a/coreutils/realpath.c
+++ b/coreutils/realpath.c
@@ -23,7 +23,7 @@ int realpath_main(int argc UNUSED_PARAM, char **argv)
do {
char *resolved_path = xmalloc_realpath(*argv);
- if (resolved_path != NULL) {
+ if (resolved_path != NULL) {
puts(resolved_path);
free(resolved_path);
} else {