rpm: respect BB_SYSTEMROOTHEADmaster

Update the 'rpm' applet so it also respects the BB_SYSTEMROOT
environment variable.

Replace chdir_system_drive() with xchdir_system_drive(), which
exits on failure to change directory.

Saves 32-36 bytes.

(GitHub PR #603)

Signed-off-by: Ron Yorston <rmy@pobox.com>

5 files changed, 10 insertions, 12 deletions

diff --git a/archival/dpkg.c b/archival/dpkg.c
index e50f94ae6..dc9db92e6 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1864,7 +1864,7 @@ int dpkg_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 
-        chdir_system_drive();
+        xchdir_system_drive();
 
         /* initialise data store */
         path = xstrdup(DPKG_DIR "/info");
diff --git a/archival/rpm.c b/archival/rpm.c
index c2f0550ff..81b3248d1 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -308,9 +308,10 @@ static void extract_cpio(int fd, const char *source_rpm)
         if (source_rpm != NULL) {
                 /* Binary rpm (it was built from some SRPM), install to root */
 #if ENABLE_PLATFORM_MINGW32
-                if (chdir_system_drive())
-#endif
+                xchdir_system_drive();
+#else
                 xchdir("/");
+#endif
         } /* else: SRPM, install to current dir */
 
         /* Initialize */
diff --git a/include/mingw.h b/include/mingw.h
index c2a106139..52f4605cf 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -672,7 +672,7 @@ int enumerate_links(const char *file, char *name) FAST_FUNC;
 int unc_root_len(const char *dir) FAST_FUNC;
 int root_len(const char *path) FAST_FUNC;
 const char *get_system_drive(void) FAST_FUNC;
-int chdir_system_drive(void);
+void xchdir_system_drive(void);
 char *xabsolute_path(char *path) FAST_FUNC;
 char *get_drive_cwd(const char *path, char *buffer, int size) FAST_FUNC;
 void fix_path_case(char *path) FAST_FUNC;
diff --git a/miscutils/man.c b/miscutils/man.c
index cf67f1538..e6da41624 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -287,7 +287,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
                 if (strchr(*ptr, '/') || strchr(*ptr, '\\'))
                         *ptr = xabsolute_path(*ptr);
         }
-        chdir_system_drive();
+        xchdir_system_drive();
 #endif
 
         conf_sec_list = xstrdup("0p:1:1p:2:3:3p:4:5:6:7:8:9");
diff --git a/win32/mingw.c b/win32/mingw.c
index 28ee81e4e..6e6b20e80 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -2461,14 +2461,11 @@ const char * FAST_FUNC get_system_drive(void)
         return getenv(BB_SYSTEMROOT) ?: drive;
 }
 
-int chdir_system_drive(void)
+void xchdir_system_drive(void)
 {
-        const char *sd = get_system_drive();
-        int ret = -1;
-
-        if (*sd)
-                ret = chdir(auto_string(concat_path_file(sd, "")));
-        return ret;
+        char *path = concat_path_file(get_system_drive(), "");
+        xchdir(path);
+        free(path);
 }
 
 /*