From: Jim Meyering <jim@meyering.net>
Date: Fri, 8 Dec 2000 07:55:05 +0000 (+0000)
Subject: Include xalloc.h.
X-Git-Tag: TEXTUTILS-2_0_10~39
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=1f47a082c4fdaa45377b122a0fdcf7dd607c96cf;p=thirdparty%2Fcoreutils.git

Include xalloc.h.
(main): Use dir_name rather than the underlying dir_name_r.
The former now handles cwd-relative names with drive-letter prefixes.
---

diff --git a/src/dirname.c b/src/dirname.c
index be1fc45590..58c2013d10 100644
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -26,6 +26,7 @@
 #include "error.h"
 #include "dirname.h"
 #include "closeout.h"
+#include "xalloc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "dirname"
@@ -92,9 +93,11 @@ main (int argc, char **argv)
       usage (1);
     }
 
-  len = dir_name_r (argv[1], &result);
-  fwrite (result, 1, len, stdout);
-  putchar ('\n');
+  result = dir_name (argv[1]);
+  if (result == NULL)
+    xalloc_die ();
+  puts (result);
+  free (result);
 
   exit (0);
 }