From f3a09c6c9bfd84fb510e218c61cfe345f8c1cf73 Mon Sep 17 00:00:00 2001 From: Mike Barcroft Date: Sun, 9 Jun 2002 00:46:24 +0000 Subject: [PATCH] Check the return value of getcwd() to avoid printf()ing a NULL. Mark usage() as __dead2 to avoid a GCC warning. Spotted by: keramida --- bin/realpath/realpath.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/realpath/realpath.c b/bin/realpath/realpath.c index 2cd9e6036e86..57cbb971cc43 100644 --- a/bin/realpath/realpath.c +++ b/bin/realpath/realpath.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) @@ -49,9 +49,10 @@ main(int argc, char *argv[]) char buf[PATH_MAX]; char *p; - if (argc == 1) - p = getcwd(NULL, 0); - else if (argc == 2) { + if (argc == 1) { + if ((p = getcwd(NULL, 0)) == NULL) + err(1, "getcwd()"); + } else if (argc == 2) { if ((p = realpath(argv[1], buf)) == NULL) err(1, "%s", argv[1]); } else