mirror of
https://github.com/sheumann/hush.git
synced 2024-06-06 02:29:31 +00:00
582dff0514
scanning. It does not catch volume managers and such. Adding even more cruft is bad, so I decided to simply scan /dev/* for any block devices. See how much better it finds devices now: # ./busybox_old blkid /dev/sda1: LABEL="/boot" UUID="7931e231-dcb4-4b6d-9301-f7354ae24061" /dev/dm-0: LABEL="Fedora-9-Live-x8" UUID="bb491e1e-1145-4f5b-b0ab-cbd2baf4f15a" /dev/dm-1: UUID="edc2a920-ef83-437e-ba64-d3b6dc851267" /dev/sdb1: UUID="6F84-ED0F" # ./busybox blkid /dev/sdb1: UUID="6F84-ED0F" /dev/root: LABEL="Fedora-9-Live-x8" UUID="bb491e1e-1145-4f5b-b0ab-cbd2baf4f15a" /dev/dm-1: UUID="edc2a920-ef83-437e-ba64-d3b6dc851267" /dev/dm-0: LABEL="Fedora-9-Live-x8" UUID="bb491e1e-1145-4f5b-b0ab-cbd2baf4f15a" /dev/sda1: LABEL="/boot" UUID="7931e231-dcb4-4b6d-9301-f7354ae24061" /dev/mapper/VolGroup00-LogVol01: UUID="edc2a920-ef83-437e-ba64-d3b6dc851267" /dev/mapper/VolGroup00-LogVol00: LABEL="Fedora-9-Live-x8" UUID="bb491e1e-1145-4f5b-b0ab-cbd2baf4f15a" function old new delta static.drive_name_string 12 - -12 append_mount_options 205 190 -15 volume_id_open_node 37 18 -19 uuidcache_check_device 485 257 -228 uuidcache_init 637 36 -601 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 0/4 up/down: 0/-875) Total: -875 bytes text data bss dec hex filename 792218 592 6648 799458 c32e2 busybox_old 791260 592 6648 798500 c2f24 busybox_unstripped
99 lines
2.5 KiB
C
99 lines
2.5 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* parse_mode implementation for busybox
|
|
*
|
|
* Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org>
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
|
*/
|
|
|
|
/* Mar 5, 2003 Manuel Novoa III
|
|
*
|
|
* This is the main work function for the 'mkdir' applet. As such, it
|
|
* strives to be SUSv3 compliant in it's behaviour when recursively
|
|
* making missing parent dirs, and in it's mode setting of the final
|
|
* directory 'path'.
|
|
*
|
|
* To recursively build all missing intermediate directories, make
|
|
* sure that (flags & FILEUTILS_RECUR) is non-zero. Newly created
|
|
* intermediate directories will have at least u+wx perms.
|
|
*
|
|
* To set specific permissions on 'path', pass the appropriate 'mode'
|
|
* val. Otherwise, pass -1 to get default permissions.
|
|
*/
|
|
|
|
#include "libbb.h"
|
|
|
|
/* This function is used from NOFORK applets. It must not allocate anything */
|
|
|
|
int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
|
|
{
|
|
mode_t mask;
|
|
const char *fail_msg;
|
|
char *s = path;
|
|
char c;
|
|
struct stat st;
|
|
|
|
mask = umask(0);
|
|
umask(mask & ~0300); /* Ensure intermediate dirs are wx */
|
|
|
|
while (1) {
|
|
c = '\0';
|
|
|
|
if (flags & FILEUTILS_RECUR) { /* Get the parent. */
|
|
/* Bypass leading non-'/'s and then subsequent '/'s. */
|
|
while (*s) {
|
|
if (*s == '/') {
|
|
do {
|
|
++s;
|
|
} while (*s == '/');
|
|
c = *s; /* Save the current char */
|
|
*s = '\0'; /* and replace it with nul. */
|
|
break;
|
|
}
|
|
++s;
|
|
}
|
|
}
|
|
|
|
if (!c) /* Last component uses orig umask */
|
|
umask(mask);
|
|
|
|
if (mkdir(path, 0777) < 0) {
|
|
/* If we failed for any other reason than the directory
|
|
* already exists, output a diagnostic and return -1. */
|
|
if (errno != EEXIST
|
|
|| !(flags & FILEUTILS_RECUR)
|
|
|| ((stat(path, &st) < 0) || !S_ISDIR(st.st_mode))
|
|
) {
|
|
fail_msg = "create";
|
|
umask(mask);
|
|
break;
|
|
}
|
|
/* Since the directory exists, don't attempt to change
|
|
* permissions if it was the full target. Note that
|
|
* this is not an error condition. */
|
|
if (!c) {
|
|
umask(mask);
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
if (!c) {
|
|
/* Done. If necessary, update perms on the newly
|
|
* created directory. Failure to update here _is_
|
|
* an error. */
|
|
if ((mode != -1) && (chmod(path, mode) < 0)) {
|
|
fail_msg = "set permissions of";
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Remove any inserted nul from the path (recursive mode). */
|
|
*s = c;
|
|
} /* while (1) */
|
|
|
|
bb_perror_msg("cannot %s directory '%s'", fail_msg, path);
|
|
return -1;
|
|
}
|