tar: don't assume root is uid 0

This is not true for Tandem NonStop Kernel.  See Joachim Schmitz's
comment in <http://bugs.gnu.org/10305#111>.
* gnulib.modules: Add root-uid.
* src/extract.c: Include <root-uid.h>.
(extr_init): Don't assume root is uid 0.

diff --git a/gnulib.modules b/gnulib.modules
index 43c9de16d48f8fe15883505666e11f597bef9dad..9e7a05a52c88161a9dd19d158d3eeb63252e1053 100644 (file)
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -45,6 +45,7 @@ quote
 quotearg
 readlinkat
 renameat
+root-uid
 rpmatch
 safe-read
 savedir

diff --git a/src/extract.c b/src/extract.c
index 0e499e5d4121649cc3c468ecb4d9aeda3aba811b..e35c8f64d4cff763397aec98abedef3c2ee61ea6 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -23,6 +23,7 @@
 #include <quotearg.h>
 #include <errno.h>
 #include <priv-set.h>
+#include <root-uid.h>
 #include <utimens.h>
 
 #include "common.h"
@@ -153,7 +154,7 @@ struct string_list
 void
 extr_init (void)
 {
-  we_are_root = geteuid () == 0;
+  we_are_root = geteuid () == ROOT_UID;
   same_permissions_option += we_are_root;
   same_owner_option += we_are_root;