Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/xfuncs_printf.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/xfuncs_printf.c (modified) (7 diffs)

branches/3.3/mindi-busybox/libbb/xfuncs_printf.c

@@ -113 +113 @@
 }
 
+void* FAST_FUNC xmemdup(const void *s, int n)
+{
+    return memcpy(xmalloc(n), s, n);
+}
+
 // Die if we can't open a file and return a FILE* to it.
 // Notice we haven't got xfread(), This is for use with fscanf() and friends.
@@ -139 +144 @@
 {
     return xopen3(pathname, flags, 0666);
+}
+
+// Warn if we can't open a file and return a fd.
+int FAST_FUNC open3_or_warn(const char *pathname, int flags, int mode)
+{
+    int ret;
+
+    ret = open(pathname, flags, mode);
+    if (ret < 0) {
+        bb_perror_msg("can't open '%s'", pathname);
+    }
+    return ret;
+}
+
+// Warn if we can't open a file and return a fd.
+int FAST_FUNC open_or_warn(const char *pathname, int flags)
+{
+    return open3_or_warn(pathname, flags, 0666);
 }
 
@@ -150 +173 @@
 }
 
-// Warn if we can't open a file and return a fd.
-int FAST_FUNC open3_or_warn(const char *pathname, int flags, int mode)
-{
-    int ret;
-
-    ret = open(pathname, flags, mode);
-    if (ret < 0) {
-        bb_perror_msg("can't open '%s'", pathname);
-    }
-    return ret;
-}
-
-// Warn if we can't open a file and return a fd.
-int FAST_FUNC open_or_warn(const char *pathname, int flags)
-{
-    return open3_or_warn(pathname, flags, 0666);
+int FAST_FUNC xopen_as_uid_gid(const char *pathname, int flags, uid_t u, gid_t g)
+{
+    int fd;
+    uid_t old_euid = geteuid();
+    gid_t old_egid = getegid();
+
+    xsetegid(g);
+    xseteuid(u);
+
+    fd = xopen(pathname, flags);
+
+    xseteuid(old_euid);
+    xsetegid(old_egid);
+
+    return fd;
 }
 
@@ -352 +374 @@
 }
 
+void FAST_FUNC xsetegid(gid_t egid)
+{
+    if (setegid(egid)) bb_perror_msg_and_die("setegid");
+}
+
+void FAST_FUNC xseteuid(uid_t euid)
+{
+    if (seteuid(euid)) bb_perror_msg_and_die("seteuid");
+}
+
 // Die if we can't chdir to a new path.
 void FAST_FUNC xchdir(const char *path)
@@ -357 +389 @@
     if (chdir(path))
         bb_perror_msg_and_die("can't change directory to '%s'", path);
+}
+
+void FAST_FUNC xfchdir(int fd)
+{
+    if (fchdir(fd))
+        bb_perror_msg_and_die("fchdir");
 }
 
@@ -542 +580 @@
 char* FAST_FUNC xmalloc_ttyname(int fd)
 {
-    char *buf = xzalloc(128);
-    int r = ttyname_r(fd, buf, 127);
-    if (r) {
-        free(buf);
-        buf = NULL;
-    }
-    return buf;
+    char buf[128];
+    int r = ttyname_r(fd, buf, sizeof(buf) - 1);
+    if (r)
+        return NULL;
+    return xstrdup(buf);
 }
 
@@ -624 +660 @@
 }
 #endif
+
+void FAST_FUNC xvfork_parent_waits_and_exits(void)
+{
+    pid_t pid;
+
+    fflush_all();
+    pid = xvfork();
+    if (pid > 0) {
+        /* Parent */
+        int exit_status = wait_for_exitstatus(pid);
+        if (WIFSIGNALED(exit_status))
+            kill_myself_with_sig(WTERMSIG(exit_status));
+        _exit(WEXITSTATUS(exit_status));
+    }
+    /* Child continues */
+}