emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install: fix install a b /a/link/to/dir

Browse Source 
install: fix -s (strip) option
nmeter: add TODO
This commit is contained in:
Denis Vlasenko 2007-06-17 00:35:15 +00:00
parent ab47eeee6a
commit a6163ca355
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
coreutils/install.c
View File

@ -102,7 +102,8 @@ int install_main(int argc, char **argv)
opt_complementary = "?:s--d:d--s" USE_SELINUX(":Z--\xff:\xff--Z"); opt_complementary = "?:s--d:d--s" USE_SELINUX(":Z--\xff:\xff--Z");
/* -c exists for backwards compatibility, it's needed */ /* -c exists for backwards compatibility, it's needed */
flags = getopt32(argc, argv, "cdpsg:m:o:" USE_SELINUX("Z:"), &gid_str, &mode_str, &uid_str USE_SELINUX(, &scontext)); flags = getopt32(argc, argv, "cdpsg:m:o:" USE_SELINUX("Z:"),
&gid_str, &mode_str, &uid_str USE_SELINUX(, &scontext));
#if ENABLE_SELINUX #if ENABLE_SELINUX
if (flags & OPT_PRESERVE_SECURITY_CONTEXT) { if (flags & OPT_PRESERVE_SECURITY_CONTEXT) {
@ -165,7 +166,8 @@ int install_main(int argc, char **argv)
return ret; return ret;
} }
isdir = lstat(argv[argc - 1], &statbuf) < 0 ? 0 : S_ISDIR(statbuf.st_mode); /* coreutils install resolves link in this case, don't use lstat */
isdir = stat(argv[argc - 1], &statbuf) < 0 ? 0 : S_ISDIR(statbuf.st_mode);
for (i = optind; i < argc - 1; i++) { for (i = optind; i < argc - 1; i++) {
char *dest; char *dest;
@ -192,7 +194,11 @@ int install_main(int argc, char **argv)
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
} }
if (flags & OPT_STRIP) { if (flags & OPT_STRIP) {
if (BB_EXECLP("strip", "strip", dest, NULL) == -1) { char *args[3];
args[0] = (char*)"strip";
args[1] = dest;
args[2] = NULL;
if (spawn_and_wait(args)) {
bb_perror_msg("strip"); bb_perror_msg("strip");
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
} }

7
procps/nmeter.c
View File

@ -11,9 +11,14 @@
// /proc/stat: // /proc/stat:
// disk_io: (3,0):(22272,17897,410702,4375,54750) // disk_io: (3,0):(22272,17897,410702,4375,54750)
// btime 1059401962 // btime 1059401962
//TODO: use sysinfo libc call/syscall, if appropriate
// (faster than open/read/close):
// sysinfo({uptime=15017, loads=[5728, 15040, 16480]
// totalram=2107416576, freeram=211525632, sharedram=0, bufferram=157204480}
// totalswap=134209536, freeswap=134209536, procs=157})
#include "libbb.h"
#include <time.h> #include <time.h>
#include "libbb.h"
typedef unsigned long long ullong; typedef unsigned long long ullong;