Compare commits

...
5 Commits
Author SHA1 Message Date
Denys Vlasenko 5e891f30d3 Revert "split: use xopen_stdin()"
This reverts commit 5168bf2caa.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
2010-09-09 14:57:56 +02:00
Denys Vlasenko 5168bf2caa split: use xopen_stdin()
function                                             old     new   delta
split_main                                           558     543     -15

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2010-08-23 03:03:09 +02:00
Denys Vlasenko dc04439450 Version 1.17.2: apply post 1.17.1 fixes, replace patch applet by Rob's version
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2010-08-23 02:53:58 +02:00
Denys Vlasenko 941fce89fa bump version to 1.17.1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2010-07-25 00:13:47 +02:00
Denys Vlasenko 503a07cab2 Apply post-1.17.0 fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2010-07-25 00:13:27 +02:00
49 changed files with 1519 additions and 645 deletions

No files matched your search

+2 -1
View File
@@ -15,7 +15,7 @@ menu "General Configuration"
config DESKTOP
bool "Enable options for full-blown desktop systems"
default n
default y
help
Enable options and features which are not essential.
Select this only if you plan to use busybox on full-blown
@@ -138,6 +138,7 @@ config UNICODE_USING_LOCALE
help
With this option on, Unicode support is implemented using libc
routines. Otherwise, internal implementation is used.
Internal implementation is smaller.
config FEATURE_CHECK_UNICODE_IN_ENV
bool "Check $LANG environment variable"
+12 -3
View File
@@ -1,6 +1,6 @@
VERSION = 1
PATCHLEVEL = 17
SUBLEVEL = 0
SUBLEVEL = 2
EXTRAVERSION =
NAME = Unnamed
@@ -433,7 +433,12 @@ ifeq ($(config-targets),1)
-include $(srctree)/arch/$(ARCH)/Makefile
export KBUILD_DEFCONFIG
config %config: scripts_basic outputmakefile gen_build_files FORCE
config: scripts_basic outputmakefile gen_build_files FORCE
$(Q)mkdir -p include
$(Q)$(MAKE) $(build)=scripts/kconfig $@
$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
%config: scripts_basic outputmakefile gen_build_files FORCE
$(Q)mkdir -p include
$(Q)$(MAKE) $(build)=scripts/kconfig $@
$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
@@ -1285,9 +1290,13 @@ endif
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
# Modules
/ %/: prepare scripts FORCE
%/: prepare scripts FORCE
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
$(build)=$(build-dir)
/: prepare scripts FORCE
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
$(build)=$(build-dir)
%.ko: prepare scripts FORCE
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
$(build)=$(build-dir) $(@:.ko=.o)
+1 -5
View File
@@ -40,8 +40,4 @@ echo '#define PACKED_USAGE \'
-e 's/$/ \\/'
echo ''
if cmp -s "$target.$$" "$target" 2>/dev/null; then
rm -- "$target.$$"
else
mv -- "$target.$$" "$target"
fi
mv -- "$target.$$" "$target"
+1 -1
View File
@@ -39,7 +39,7 @@ config FEATURE_SEAMLESS_Z
config AR
bool "ar"
default y
default n # needs to be improved to be able to replace binutils ar
help
ar is an archival utility program used to create, modify, and
extract contents from archives. An archive is a single file holding
+1 -1
View File
@@ -237,7 +237,7 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
struct tar_header_t header;
memset(&header, 0, sizeof(header));
strncpy(header.name, header_name, sizeof(header.name));
/* POSIX says to mask mode with 07777. */
Binary file not shown.
+1 -1
View File
@@ -92,7 +92,7 @@ int dos2unix_main(int argc UNUSED_PARAM, char **argv)
do {
/* might be convert(NULL) if there is no filename given */
convert(*argv, conv_type);
} while (*++argv);
} while (*argv && *++argv);
return 0;
}
+1 -1
View File
@@ -23,7 +23,7 @@ int realpath_main(int argc UNUSED_PARAM, char **argv)
do {
char *resolved_path = xmalloc_realpath(*argv);
if (resolved_path != NULL) {
if (resolved_path != NULL) {
puts(resolved_path);
free(resolved_path);
} else {
+2 -1
View File
@@ -50,7 +50,8 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
opts = getopt32(argv, "dqtp:", &path);
chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX");
chp = concat_path_file(path, chp);
if (!strchr(chp, '/') || (opts & 8))
chp = concat_path_file(path, chp);
if (opts & 1) { /* -d */
if (mkdtemp(chp) == NULL)
+1 -1
View File
@@ -45,7 +45,7 @@ config LSATTR
config TUNE2FS
bool "tune2fs"
default y
default n # off: it is too limited compared to upstream version
help
tune2fs allows the system administrator to adjust various tunable
filesystem parameters on Linux ext2/ext3 filesystems.
+25 -2
View File
@@ -121,6 +121,7 @@ typedef struct FILE_and_pos_t {
struct globals {
smallint exit_status;
int opt_U_context;
const char *other_dir;
char *label[2];
struct stat stb[2];
};
@@ -760,9 +761,11 @@ static int FAST_FUNC add_to_dirlist(const char *filename,
void *userdata, int depth UNUSED_PARAM)
{
struct dlist *const l = userdata;
const char *file = filename + l->len;
while (*file == '/')
file++;
l->dl = xrealloc_vector(l->dl, 6, l->e);
/* + 1 skips "/" after dirname */
l->dl[l->e] = xstrdup(filename + l->len + 1);
l->dl[l->e] = xstrdup(file);
l->e++;
return TRUE;
}
@@ -778,6 +781,25 @@ static int FAST_FUNC skip_dir(const char *filename,
add_to_dirlist(filename, sb, userdata, depth);
return SKIP;
}
if (!(option_mask32 & FLAG(N))) {
/* -r without -N: no need to recurse into dirs
* which do not exist on the "other side".
* Testcase: diff -r /tmp /
* (it would recurse deep into /proc without this code) */
struct dlist *const l = userdata;
filename += l->len;
if (filename[0]) {
struct stat osb;
char *othername = concat_path_file(G.other_dir, filename);
int r = stat(othername, &osb);
free(othername);
if (r != 0 || !S_ISDIR(osb.st_mode)) {
/* other dir doesn't have similarly named
* directory, don't recurse */
return SKIP;
}
}
}
return TRUE;
}
@@ -791,6 +813,7 @@ static void diffdir(char *p[2], const char *s_start)
/*list[i].s = list[i].e = 0; - memset did it */
/*list[i].dl = NULL; */
G.other_dir = p[1 - i];
/* We need to trim root directory prefix.
* Using list.len to specify its length,
* add_to_dirlist will remove it. */
+585 -270
View File
@@ -1,306 +1,621 @@
/* vi: set sw=4 ts=4: */
/*
* busybox patch applet to handle the unified diff format.
* Copyright (C) 2003 Glenn McGrath
*
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*
* This applet is written to work with patches generated by GNU diff,
* where there is equivalent functionality busybox patch shall behave
* as per GNU patch.
*
* There is a SUSv3 specification for patch, however it looks to be
* incomplete, it doesnt even mention unified diff format.
* http://www.opengroup.org/onlinepubs/007904975/utilities/patch.html
*
* Issues
* - Non-interactive
* - Patches must apply cleanly or patch (not just one hunk) will fail.
* - Reject file isnt saved
*/
/* Adapted from toybox's patch. */
/* vi: set sw=4 ts=4:
*
* patch.c - Apply a "universal" diff.
*
* Copyright 2007 Rob Landley <rob@landley.net>
*
* see http://www.opengroup.org/onlinepubs/009695399/utilities/patch.html
* (But only does -u, because who still cares about "ed"?)
*
* TODO:
* -b backup
* -l treat all whitespace as a single space
* -d chdir first
* -D define wrap #ifdef and #ifndef around changes
* -o outfile output here instead of in place
* -r rejectfile write rejected hunks to this file
*
* -E remove empty files --remove-empty-files
* -f force (no questions asked)
* -F fuzz (number, default 2)
* [file] which file to patch
USE_PATCH(NEWTOY(patch, USE_TOYBOX_DEBUG("x")"up#i:R", TOYFLAG_USR|TOYFLAG_BIN))
config PATCH
bool "patch"
default y
help
usage: patch [-i file] [-p depth] [-Ru]
Apply a unified diff to one or more files.
-i Input file (defaults=stdin)
-p number of '/' to strip from start of file paths (default=all)
-R Reverse patch.
-u Ignored (only handles "unified" diffs)
This version of patch only handles unified diffs, and only modifies
a file when all all hunks to that file apply. Patch prints failed
hunks to stderr, and exits with nonzero status if any hunks fail.
A file compared against /dev/null (or with a date <= the epoch) is
created/deleted as appropriate.
*/
#include "libbb.h"
static unsigned copy_lines(FILE *src_stream, FILE *dst_stream, unsigned lines_count)
struct double_list {
struct double_list *next;
struct double_list *prev;
char *data;
};
// Return the first item from the list, advancing the list (which must be called
// as &list)
static
void *TOY_llist_pop(void *list)
{
while (src_stream && lines_count) {
char *line;
line = xmalloc_fgets(src_stream);
if (line == NULL) {
break;
}
if (fputs(line, dst_stream) == EOF) {
bb_perror_msg_and_die("error writing to new file");
}
free(line);
lines_count--;
}
return lines_count;
// I'd use a void ** for the argument, and even accept the typecast in all
// callers as documentation you need the &, except the stupid compiler
// would then scream about type-punned pointers. Screw it.
void **llist = (void **)list;
void **next = (void **)*llist;
*llist = *next;
return (void *)next;
}
/* If patch_level is -1 it will remove all directory names
* char *line must be greater than 4 chars
* returns NULL if the file doesnt exist or error
* returns malloc'ed filename
* NB: frees 1st argument!
*/
static char *extract_filename(char *line, int patch_level, const char *pat)
// Free all the elements of a linked list
// if freeit!=NULL call freeit() on each element before freeing it.
static
void TOY_llist_free(void *list, void (*freeit)(void *data))
{
char *temp = NULL, *filename_start_ptr = line + 4;
while (list) {
void *pop = TOY_llist_pop(&list);
if (freeit) freeit(pop);
else free(pop);
if (strncmp(line, pat, 4) == 0) {
/* Terminate string at end of source filename */
line[strcspn(line, "\t\n\r")] = '\0';
/* Skip over (patch_level) number of leading directories */
while (patch_level--) {
temp = strchr(filename_start_ptr, '/');
if (!temp)
break;
filename_start_ptr = temp + 1;
}
temp = xstrdup(filename_start_ptr);
// End doubly linked list too.
if (list==pop) break;
}
free(line);
return temp;
}
//Override bbox's names
#define llist_pop TOY_llist_pop
#define llist_free TOY_llist_free
// Add an entry to the end off a doubly linked list
static
struct double_list *dlist_add(struct double_list **list, char *data)
{
struct double_list *line = xmalloc(sizeof(struct double_list));
line->data = data;
if (*list) {
line->next = *list;
line->prev = (*list)->prev;
(*list)->prev->next = line;
(*list)->prev = line;
} else *list = line->next = line->prev = line;
return line;
}
// Ensure entire path exists.
// If mode != -1 set permissions on newly created dirs.
// Requires that path string be writable (for temporary null terminators).
static
void xmkpath(char *path, int mode)
{
char *p, old;
mode_t mask;
int rc;
struct stat st;
for (p = path; ; p++) {
if (!*p || *p == '/') {
old = *p;
*p = rc = 0;
if (stat(path, &st) || !S_ISDIR(st.st_mode)) {
if (mode != -1) {
mask = umask(0);
rc = mkdir(path, mode);
umask(mask);
} else rc = mkdir(path, 0777);
}
*p = old;
if(rc) bb_perror_msg_and_die("mkpath '%s'", path);
}
if (!*p) break;
}
}
// Slow, but small.
static
char *get_rawline(int fd, long *plen, char end)
{
char c, *buf = NULL;
long len = 0;
for (;;) {
if (1>read(fd, &c, 1)) break;
if (!(len & 63)) buf=xrealloc(buf, len+65);
if ((buf[len++]=c) == end) break;
}
if (buf) buf[len]=0;
if (plen) *plen = len;
return buf;
}
static
char *get_line(int fd)
{
long len;
char *buf = get_rawline(fd, &len, '\n');
if (buf && buf[--len]=='\n') buf[len]=0;
return buf;
}
// Copy the rest of in to out and close both files.
static
void xsendfile(int in, int out)
{
long len;
char buf[4096];
if (in<0) return;
for (;;) {
len = safe_read(in, buf, 4096);
if (len<1) break;
xwrite(out, buf, len);
}
}
// Copy the rest of the data and replace the original with the copy.
static
void replace_tempfile(int fdin, int fdout, char **tempname)
{
char *temp = xstrdup(*tempname);
temp[strlen(temp)-6]=0;
if (fdin != -1) {
xsendfile(fdin, fdout);
xclose(fdin);
}
xclose(fdout);
rename(*tempname, temp);
free(*tempname);
free(temp);
*tempname = NULL;
}
// Open a temporary file to copy an existing file into.
static
int copy_tempfile(int fdin, char *name, char **tempname)
{
struct stat statbuf;
int fd;
*tempname = xasprintf("%sXXXXXX", name);
fd = mkstemp(*tempname);
if(-1 == fd) bb_perror_msg_and_die("no temp file");
// Set permissions of output file
fstat(fdin, &statbuf);
fchmod(fd, statbuf.st_mode);
return fd;
}
// Abort the copy and delete the temporary file.
static
void delete_tempfile(int fdin, int fdout, char **tempname)
{
close(fdin);
close(fdout);
unlink(*tempname);
free(*tempname);
*tempname = NULL;
}
struct globals {
char *infile;
long prefix;
struct double_list *current_hunk;
long oldline, oldlen, newline, newlen;
long linenum;
int context, state, filein, fileout, filepatch, hunknum;
char *tempname;
// was toys.foo:
int exitval;
};
#define TT (*ptr_to_globals)
#define INIT_TT() do { \
SET_PTR_TO_GLOBALS(xzalloc(sizeof(TT))); \
} while (0)
#define FLAG_STR "Rup:i:Nx"
/* FLAG_REVERSE must be == 1! Code uses this fact. */
#define FLAG_REVERSE (1 << 0)
#define FLAG_u (1 << 1)
#define FLAG_PATHLEN (1 << 2)
#define FLAG_INPUT (1 << 3)
#define FLAG_IGNORE (1 << 4)
//non-standard:
#define FLAG_DEBUG (1 << 5)
// Dispose of a line of input, either by writing it out or discarding it.
// state < 2: just free
// state = 2: write whole line to stderr
// state = 3: write whole line to fileout
// state > 3: write line+1 to fileout when *line != state
#define PATCH_DEBUG (option_mask32 & FLAG_DEBUG)
static void do_line(void *data)
{
struct double_list *dlist = (struct double_list *)data;
if (TT.state>1 && *dlist->data != TT.state)
fdprintf(TT.state == 2 ? 2 : TT.fileout,
"%s\n", dlist->data+(TT.state>3 ? 1 : 0));
if (PATCH_DEBUG) fdprintf(2, "DO %d: %s\n", TT.state, dlist->data);
free(dlist->data);
free(data);
}
static void finish_oldfile(void)
{
if (TT.tempname) replace_tempfile(TT.filein, TT.fileout, &TT.tempname);
TT.fileout = TT.filein = -1;
}
static void fail_hunk(void)
{
if (!TT.current_hunk) return;
TT.current_hunk->prev->next = 0;
fdprintf(2, "Hunk %d FAILED %ld/%ld.\n", TT.hunknum, TT.oldline, TT.newline);
TT.exitval = 1;
// If we got to this point, we've seeked to the end. Discard changes to
// this file and advance to next file.
TT.state = 2;
llist_free(TT.current_hunk, do_line);
TT.current_hunk = NULL;
delete_tempfile(TT.filein, TT.fileout, &TT.tempname);
TT.state = 0;
}
// Given a hunk of a unified diff, make the appropriate change to the file.
// This does not use the location information, but instead treats a hunk
// as a sort of regex. Copies data from input to output until it finds
// the change to be made, then outputs the changed data and returns.
// (Finding EOF first is an error.) This is a single pass operation, so
// multiple hunks must occur in order in the file.
static int apply_one_hunk(void)
{
struct double_list *plist, *buf = NULL, *check;
int matcheof = 0, reverse = option_mask32 & FLAG_REVERSE, backwarn = 0;
/* Do we try "dummy" revert to check whether
* to silently skip this hunk? Used to implement -N.
*/
int dummy_revert = 0;
// Break doubly linked list so we can use singly linked traversal function.
TT.current_hunk->prev->next = NULL;
// Match EOF if there aren't as many ending context lines as beginning
for (plist = TT.current_hunk; plist; plist = plist->next) {
if (plist->data[0]==' ') matcheof++;
else matcheof = 0;
if (PATCH_DEBUG) fdprintf(2, "HUNK:%s\n", plist->data);
}
matcheof = matcheof < TT.context;
if (PATCH_DEBUG) fdprintf(2,"MATCHEOF=%c\n", matcheof ? 'Y' : 'N');
// Loop through input data searching for this hunk. Match all context
// lines and all lines to be removed until we've found the end of a
// complete hunk.
plist = TT.current_hunk;
buf = NULL;
if (TT.context) for (;;) {
char *data = get_line(TT.filein);
TT.linenum++;
// Figure out which line of hunk to compare with next. (Skip lines
// of the hunk we'd be adding.)
while (plist && *plist->data == "+-"[reverse]) {
if (data && !strcmp(data, plist->data+1)) {
if (!backwarn) {
backwarn++;
if (option_mask32 & FLAG_IGNORE) {
dummy_revert = 1;
reverse ^= 1;
continue;
}
fdprintf(2,"Possibly reversed hunk %d at %ld\n",
TT.hunknum, TT.linenum);
}
}
plist = plist->next;
}
// Is this EOF?
if (!data) {
if (PATCH_DEBUG) fdprintf(2, "INEOF\n");
// Does this hunk need to match EOF?
if (!plist && matcheof) break;
// File ended before we found a place for this hunk.
fail_hunk();
goto done;
} else if (PATCH_DEBUG) fdprintf(2, "IN: %s\n", data);
check = dlist_add(&buf, data);
// Compare this line with next expected line of hunk.
// todo: teach the strcmp() to ignore whitespace.
// A match can fail because the next line doesn't match, or because
// we hit the end of a hunk that needed EOF, and this isn't EOF.
// If match failed, flush first line of buffered data and
// recheck buffered data for a new match until we find one or run
// out of buffer.
for (;;) {
if (!plist || strcmp(check->data, plist->data+1)) {
// Match failed. Write out first line of buffered data and
// recheck remaining buffered data for a new match.
if (PATCH_DEBUG)
fdprintf(2, "NOT: %s\n", plist->data);
TT.state = 3;
check = llist_pop(&buf);
check->prev->next = buf;
buf->prev = check->prev;
do_line(check);
plist = TT.current_hunk;
// If we've reached the end of the buffer without confirming a
// match, read more lines.
if (check==buf) {
buf = 0;
break;
}
check = buf;
} else {
if (PATCH_DEBUG)
fdprintf(2, "MAYBE: %s\n", plist->data);
// This line matches. Advance plist, detect successful match.
plist = plist->next;
if (!plist && !matcheof) goto out;
check = check->next;
if (check == buf) break;
}
}
}
out:
// We have a match. Emit changed data.
TT.state = "-+"[reverse ^ dummy_revert];
llist_free(TT.current_hunk, do_line);
TT.current_hunk = NULL;
TT.state = 1;
done:
if (buf) {
buf->prev->next = NULL;
llist_free(buf, do_line);
}
return TT.state;
}
// Read a patch file and find hunks, opening/creating/deleting files.
// Call apply_one_hunk() on each hunk.
// state 0: Not in a hunk, look for +++.
// state 1: Found +++ file indicator, look for @@
// state 2: In hunk: counting initial context lines
// state 3: In hunk: getting body
int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int patch_main(int argc UNUSED_PARAM, char **argv)
{
struct stat saved_stat;
char *patch_line;
FILE *patch_file;
int patch_level;
int ret = 0;
char plus = '+';
unsigned opt;
enum {
OPT_R = (1 << 2),
OPT_N = (1 << 3),
/*OPT_f = (1 << 4), ignored */
/*OPT_E = (1 << 5), ignored, this is the default */
/*OPT_g = (1 << 6), ignored */
OPT_dry_run = (1 << 7) * ENABLE_LONG_OPTS,
};
int opts;
int reverse, state = 0;
char *oldname = NULL, *newname = NULL;
char *opt_p, *opt_i;
xfunc_error_retval = 2;
{
const char *p = "-1";
const char *i = "-"; /* compat */
#if ENABLE_LONG_OPTS
static const char patch_longopts[] ALIGN1 =
"strip\0" Required_argument "p"
"input\0" Required_argument "i"
"reverse\0" No_argument "R"
"forward\0" No_argument "N"
/* "Assume user knows what [s]he is doing, do not ask any questions": */
"force\0" No_argument "f" /*ignored*/
# if ENABLE_DESKTOP
"remove-empty-files\0" No_argument "E" /*ignored*/
/* "Controls actions when a file is under RCS or SCCS control,
* and does not exist or is read-only and matches the default version,
* or when a file is under ClearCase control and does not exist..."
* IOW: rather obscure option.
* But Gentoo's portage does use -g0 */
"get\0" Required_argument "g" /*ignored*/
# endif
"dry-run\0" No_argument "\xfd"
# if ENABLE_DESKTOP
"backup-if-mismatch\0" No_argument "\xfe" /*ignored*/
"no-backup-if-mismatch\0" No_argument "\xff" /*ignored*/
# endif
;
applet_long_options = patch_longopts;
#endif
/* -f,-E,-g are ignored */
opt = getopt32(argv, "p:i:RN""fEg:", &p, &i, NULL);
if (opt & OPT_R)
plus = '-';
patch_level = xatoi(p); /* can be negative! */
patch_file = xfopen_stdin(i);
INIT_TT();
opts = getopt32(argv, FLAG_STR, &opt_p, &opt_i);
argv += optind;
reverse = opts & FLAG_REVERSE;
TT.prefix = (opts & FLAG_PATHLEN) ? xatoi(opt_p) : 0; // can be negative!
TT.filein = TT.fileout = -1;
if (opts & FLAG_INPUT) {
TT.filepatch = xopen_stdin(opt_i);
} else {
if (argv[0] && argv[1]) {
TT.filepatch = xopen_stdin(argv[1]);
}
}
if (argv[0]) {
oldname = xstrdup(argv[0]);
newname = xstrdup(argv[0]);
}
patch_line = xmalloc_fgetline(patch_file);
while (patch_line) {
FILE *src_stream;
FILE *dst_stream;
//char *old_filename;
char *new_filename;
char *backup_filename = NULL;
unsigned src_cur_line = 1;
unsigned dst_cur_line = 0;
unsigned dst_beg_line;
unsigned bad_hunk_count = 0;
unsigned hunk_count = 0;
smallint copy_trailing_lines_flag = 0;
// Loop through the lines in the patch
for(;;) {
char *patchline;
/* Skip everything upto the "---" marker
* No need to parse the lines "Only in <dir>", and "diff <args>"
*/
do {
/* Extract the filename used before the patch was generated */
new_filename = extract_filename(patch_line, patch_level, "--- ");
// was old_filename above
patch_line = xmalloc_fgetline(patch_file);
if (!patch_line) goto quit;
} while (!new_filename);
free(new_filename); // "source" filename is irrelevant
patchline = get_line(TT.filepatch);
if (!patchline) break;
new_filename = extract_filename(patch_line, patch_level, "+++ ");
if (!new_filename) {
bb_error_msg_and_die("invalid patch");
// Other versions of patch accept damaged patches,
// so we need to also.
if (!*patchline) {
free(patchline);
patchline = xstrdup(" ");
}
/* Get access rights from the file to be patched */
if (stat(new_filename, &saved_stat) != 0) {
char *slash = strrchr(new_filename, '/');
if (slash) {
/* Create leading directories */
*slash = '\0';
bb_make_directory(new_filename, -1, FILEUTILS_RECUR);
*slash = '/';
}
src_stream = NULL;
saved_stat.st_mode = 0644;
} else if (!(opt & OPT_dry_run)) {
backup_filename = xasprintf("%s.orig", new_filename);
xrename(new_filename, backup_filename);
src_stream = xfopen_for_read(backup_filename);
} else
src_stream = xfopen_for_read(new_filename);
// Are we assembling a hunk?
if (state >= 2) {
if (*patchline==' ' || *patchline=='+' || *patchline=='-') {
dlist_add(&TT.current_hunk, patchline);
if (opt & OPT_dry_run) {
dst_stream = xfopen_for_write("/dev/null");
} else {
dst_stream = xfopen_for_write(new_filename);
fchmod(fileno(dst_stream), saved_stat.st_mode);
if (*patchline != '+') TT.oldlen--;
if (*patchline != '-') TT.newlen--;
// Context line?
if (*patchline==' ' && state==2) TT.context++;
else state=3;
// If we've consumed all expected hunk lines, apply the hunk.
if (!TT.oldlen && !TT.newlen) state = apply_one_hunk();
continue;
}
fail_hunk();
state = 0;
continue;
}
printf("patching file %s\n", new_filename);
// Open a new file?
if (!strncmp("--- ", patchline, 4) || !strncmp("+++ ", patchline, 4)) {
char *s, **name = reverse ? &newname : &oldname;
int i;
/* Handle all hunks for this file */
patch_line = xmalloc_fgets(patch_file);
while (patch_line) {
unsigned count;
unsigned src_beg_line;
unsigned hunk_offset_start;
unsigned src_last_line = 1;
unsigned dst_last_line = 1;
if ((sscanf(patch_line, "@@ -%d,%d +%d,%d", &src_beg_line, &src_last_line, &dst_beg_line, &dst_last_line) < 3)
&& (sscanf(patch_line, "@@ -%d +%d,%d", &src_beg_line, &dst_beg_line, &dst_last_line) < 2)
) {
/* No more hunks for this file */
break;
if (*patchline == '+') {
name = reverse ? &oldname : &newname;
state = 1;
}
if (plus != '+') {
/* reverse patch */
unsigned tmp = src_last_line;
src_last_line = dst_last_line;
dst_last_line = tmp;
tmp = src_beg_line;
src_beg_line = dst_beg_line;
dst_beg_line = tmp;
}
hunk_count++;
if (src_beg_line && dst_beg_line) {
/* Copy unmodified lines upto start of hunk */
/* src_beg_line will be 0 if it's a new file */
count = src_beg_line - src_cur_line;
if (copy_lines(src_stream, dst_stream, count)) {
bb_error_msg_and_die("bad src file");
}
src_cur_line += count;
dst_cur_line += count;
copy_trailing_lines_flag = 1;
}
src_last_line += hunk_offset_start = src_cur_line;
dst_last_line += dst_cur_line;
finish_oldfile();
while (1) {
free(patch_line);
patch_line = xmalloc_fgets(patch_file);
if (patch_line == NULL)
break; /* EOF */
if (!*patch_line) {
/* whitespace-damaged patch with "" lines */
free(patch_line);
patch_line = xstrdup(" ");
if (!argv[0]) {
free(*name);
// Trim date from end of filename (if any). We don't care.
for (s = patchline+4; *s && *s!='\t'; s++)
if (*s=='\\' && s[1]) s++;
i = atoi(s);
if (i>1900 && i<=1970)
*name = xstrdup("/dev/null");
else {
*s = 0;
*name = xstrdup(patchline+4);
}
if ((*patch_line != '-') && (*patch_line != '+')
&& (*patch_line != ' ')
) {
break; /* End of hunk */
}
// We defer actually opening the file because svn produces broken
// patches that don't signal they want to create a new file the
// way the patch man page says, so you have to read the first hunk
// and _guess_.
// Start a new hunk? Usually @@ -oldline,oldlen +newline,newlen @@
// but a missing ,value means the value is 1.
} else if (state == 1 && !strncmp("@@ -", patchline, 4)) {
int i;
char *s = patchline+4;
// Read oldline[,oldlen] +newline[,newlen]
TT.oldlen = TT.newlen = 1;
TT.oldline = strtol(s, &s, 10);
if (*s == ',') TT.oldlen=strtol(s+1, &s, 10);
TT.newline = strtol(s+2, &s, 10);
if (*s == ',') TT.newlen = strtol(s+1, &s, 10);
TT.context = 0;
state = 2;
// If this is the first hunk, open the file.
if (TT.filein == -1) {
int oldsum, newsum, del = 0;
char *name;
oldsum = TT.oldline + TT.oldlen;
newsum = TT.newline + TT.newlen;
name = reverse ? oldname : newname;
// We're deleting oldname if new file is /dev/null (before -p)
// or if new hunk is empty (zero context) after patching
if (!strcmp(name, "/dev/null") || !(reverse ? oldsum : newsum))
{
name = reverse ? newname : oldname;
del++;
}
if (*patch_line != plus) { /* '-' or ' ' */
char *src_line = NULL;
if (src_cur_line == src_last_line)
break;
if (src_stream) {
src_line = xmalloc_fgets(src_stream);
if (src_line) {
int diff = strcmp(src_line, patch_line + 1);
src_cur_line++;
free(src_line);
if (diff)
src_line = NULL;
// handle -p path truncation.
for (i=0, s = name; *s;) {
if ((option_mask32 & FLAG_PATHLEN) && TT.prefix == i) break;
if (*(s++)=='/') {
name = s;
i++;
}
}
if (del) {
printf("removing %s\n", name);
xunlink(name);
state = 0;
// If we've got a file to open, do so.
} else if (!(option_mask32 & FLAG_PATHLEN) || i <= TT.prefix) {
// If the old file was null, we're creating a new one.
if (!strcmp(oldname, "/dev/null") || !oldsum) {
printf("creating %s\n", name);
s = strrchr(name, '/');
if (s) {
*s = 0;
xmkpath(name, -1);
*s = '/';
}
TT.filein = xopen3(name, O_CREAT|O_EXCL|O_RDWR, 0666);
} else {
printf("patching file %s\n", name);
TT.filein = xopen(name, O_RDWR);
}
/* Do not patch an already patched hunk with -N */
if (src_line == 0 && (opt & OPT_N)) {
continue;
}
if (!src_line) {
bb_error_msg("hunk #%u FAILED at %u", hunk_count, hunk_offset_start);
bad_hunk_count++;
break;
}
if (*patch_line != ' ') { /* '-' */
continue;
}
TT.fileout = copy_tempfile(TT.filein, name, &TT.tempname);
TT.linenum = 0;
TT.hunknum = 0;
}
if (dst_cur_line == dst_last_line)
break;
fputs(patch_line + 1, dst_stream);
dst_cur_line++;
} /* end of while loop handling one hunk */
} /* end of while loop handling one file */
}
/* Cleanup last patched file */
if (copy_trailing_lines_flag) {
copy_lines(src_stream, dst_stream, (unsigned)(-1));
TT.hunknum++;
continue;
}
if (src_stream) {
fclose(src_stream);
}
fclose(dst_stream);
if (bad_hunk_count) {
ret = 1;
bb_error_msg("%u out of %u hunk FAILED", bad_hunk_count, hunk_count);
} else {
/* It worked, we can remove the backup */
if (backup_filename) {
unlink(backup_filename);
}
if (!(opt & OPT_dry_run)
&& ((dst_cur_line == 0) || (dst_beg_line == 0))
) {
/* The new patched file is empty, remove it */
xunlink(new_filename);
// /* old_filename and new_filename may be the same file */
// unlink(old_filename);
}
}
free(backup_filename);
//free(old_filename);
free(new_filename);
} /* end of "while there are patch lines" */
quit:
/* 0 = SUCCESS
* 1 = Some hunks failed
* 2 = More serious problems (exited earlier)
*/
return ret;
// If we didn't continue above, discard this line.
free(patchline);
}
finish_oldfile();
if (ENABLE_FEATURE_CLEAN_UP) {
close(TT.filepatch);
free(oldname);
free(newname);
}
return TT.exitval;
}
+306
View File
@@ -0,0 +1,306 @@
/* vi: set sw=4 ts=4: */
/*
* busybox patch applet to handle the unified diff format.
* Copyright (C) 2003 Glenn McGrath
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*
* This applet is written to work with patches generated by GNU diff,
* where there is equivalent functionality busybox patch shall behave
* as per GNU patch.
*
* There is a SUSv3 specification for patch, however it looks to be
* incomplete, it doesnt even mention unified diff format.
* http://www.opengroup.org/onlinepubs/007904975/utilities/patch.html
*
* Issues
* - Non-interactive
* - Patches must apply cleanly or patch (not just one hunk) will fail.
* - Reject file isnt saved
*/
#include "libbb.h"
static unsigned copy_lines(FILE *src_stream, FILE *dst_stream, unsigned lines_count)
{
while (src_stream && lines_count) {
char *line;
line = xmalloc_fgets(src_stream);
if (line == NULL) {
break;
}
if (fputs(line, dst_stream) == EOF) {
bb_perror_msg_and_die("error writing to new file");
}
free(line);
lines_count--;
}
return lines_count;
}
/* If patch_level is -1 it will remove all directory names
* char *line must be greater than 4 chars
* returns NULL if the file doesnt exist or error
* returns malloc'ed filename
* NB: frees 1st argument!
*/
static char *extract_filename(char *line, int patch_level, const char *pat)
{
char *temp = NULL, *filename_start_ptr = line + 4;
if (strncmp(line, pat, 4) == 0) {
/* Terminate string at end of source filename */
line[strcspn(line, "\t\n\r")] = '\0';
/* Skip over (patch_level) number of leading directories */
while (patch_level--) {
temp = strchr(filename_start_ptr, '/');
if (!temp)
break;
filename_start_ptr = temp + 1;
}
temp = xstrdup(filename_start_ptr);
}
free(line);
return temp;
}
int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int patch_main(int argc UNUSED_PARAM, char **argv)
{
struct stat saved_stat;
char *patch_line;
FILE *patch_file;
int patch_level;
int ret = 0;
char plus = '+';
unsigned opt;
enum {
OPT_R = (1 << 2),
OPT_N = (1 << 3),
/*OPT_f = (1 << 4), ignored */
/*OPT_E = (1 << 5), ignored, this is the default */
/*OPT_g = (1 << 6), ignored */
OPT_dry_run = (1 << 7) * ENABLE_LONG_OPTS,
};
xfunc_error_retval = 2;
{
const char *p = "-1";
const char *i = "-"; /* compat */
#if ENABLE_LONG_OPTS
static const char patch_longopts[] ALIGN1 =
"strip\0" Required_argument "p"
"input\0" Required_argument "i"
"reverse\0" No_argument "R"
"forward\0" No_argument "N"
/* "Assume user knows what [s]he is doing, do not ask any questions": */
"force\0" No_argument "f" /*ignored*/
# if ENABLE_DESKTOP
"remove-empty-files\0" No_argument "E" /*ignored*/
/* "Controls actions when a file is under RCS or SCCS control,
* and does not exist or is read-only and matches the default version,
* or when a file is under ClearCase control and does not exist..."
* IOW: rather obscure option.
* But Gentoo's portage does use -g0 */
"get\0" Required_argument "g" /*ignored*/
# endif
"dry-run\0" No_argument "\xfd"
# if ENABLE_DESKTOP
"backup-if-mismatch\0" No_argument "\xfe" /*ignored*/
"no-backup-if-mismatch\0" No_argument "\xff" /*ignored*/
# endif
;
applet_long_options = patch_longopts;
#endif
/* -f,-E,-g are ignored */
opt = getopt32(argv, "p:i:RN""fEg:", &p, &i, NULL);
if (opt & OPT_R)
plus = '-';
patch_level = xatoi(p); /* can be negative! */
patch_file = xfopen_stdin(i);
}
patch_line = xmalloc_fgetline(patch_file);
while (patch_line) {
FILE *src_stream;
FILE *dst_stream;
//char *old_filename;
char *new_filename;
char *backup_filename = NULL;
unsigned src_cur_line = 1;
unsigned dst_cur_line = 0;
unsigned dst_beg_line;
unsigned bad_hunk_count = 0;
unsigned hunk_count = 0;
smallint copy_trailing_lines_flag = 0;
/* Skip everything upto the "---" marker
* No need to parse the lines "Only in <dir>", and "diff <args>"
*/
do {
/* Extract the filename used before the patch was generated */
new_filename = extract_filename(patch_line, patch_level, "--- ");
// was old_filename above
patch_line = xmalloc_fgetline(patch_file);
if (!patch_line) goto quit;
} while (!new_filename);
free(new_filename); // "source" filename is irrelevant
new_filename = extract_filename(patch_line, patch_level, "+++ ");
if (!new_filename) {
bb_error_msg_and_die("invalid patch");
}
/* Get access rights from the file to be patched */
if (stat(new_filename, &saved_stat) != 0) {
char *slash = strrchr(new_filename, '/');
if (slash) {
/* Create leading directories */
*slash = '\0';
bb_make_directory(new_filename, -1, FILEUTILS_RECUR);
*slash = '/';
}
src_stream = NULL;
saved_stat.st_mode = 0644;
} else if (!(opt & OPT_dry_run)) {
backup_filename = xasprintf("%s.orig", new_filename);
xrename(new_filename, backup_filename);
src_stream = xfopen_for_read(backup_filename);
} else
src_stream = xfopen_for_read(new_filename);
if (opt & OPT_dry_run) {
dst_stream = xfopen_for_write("/dev/null");
} else {
dst_stream = xfopen_for_write(new_filename);
fchmod(fileno(dst_stream), saved_stat.st_mode);
}
printf("patching file %s\n", new_filename);
/* Handle all hunks for this file */
patch_line = xmalloc_fgets(patch_file);
while (patch_line) {
unsigned count;
unsigned src_beg_line;
unsigned hunk_offset_start;
unsigned src_last_line = 1;
unsigned dst_last_line = 1;
if ((sscanf(patch_line, "@@ -%d,%d +%d,%d", &src_beg_line, &src_last_line, &dst_beg_line, &dst_last_line) < 3)
&& (sscanf(patch_line, "@@ -%d +%d,%d", &src_beg_line, &dst_beg_line, &dst_last_line) < 2)
) {
/* No more hunks for this file */
break;
}
if (plus != '+') {
/* reverse patch */
unsigned tmp = src_last_line;
src_last_line = dst_last_line;
dst_last_line = tmp;
tmp = src_beg_line;
src_beg_line = dst_beg_line;
dst_beg_line = tmp;
}
hunk_count++;
if (src_beg_line && dst_beg_line) {
/* Copy unmodified lines upto start of hunk */
/* src_beg_line will be 0 if it's a new file */
count = src_beg_line - src_cur_line;
if (copy_lines(src_stream, dst_stream, count)) {
bb_error_msg_and_die("bad src file");
}
src_cur_line += count;
dst_cur_line += count;
copy_trailing_lines_flag = 1;
}
src_last_line += hunk_offset_start = src_cur_line;
dst_last_line += dst_cur_line;
while (1) {
free(patch_line);
patch_line = xmalloc_fgets(patch_file);
if (patch_line == NULL)
break; /* EOF */
if (!*patch_line) {
/* whitespace-damaged patch with "" lines */
free(patch_line);
patch_line = xstrdup(" ");
}
if ((*patch_line != '-') && (*patch_line != '+')
&& (*patch_line != ' ')
) {
break; /* End of hunk */
}
if (*patch_line != plus) { /* '-' or ' ' */
char *src_line = NULL;
if (src_cur_line == src_last_line)
break;
if (src_stream) {
src_line = xmalloc_fgets(src_stream);
if (src_line) {
int diff = strcmp(src_line, patch_line + 1);
src_cur_line++;
free(src_line);
if (diff)
src_line = NULL;
}
}
/* Do not patch an already patched hunk with -N */
if (src_line == 0 && (opt & OPT_N)) {
continue;
}
if (!src_line) {
bb_error_msg("hunk #%u FAILED at %u", hunk_count, hunk_offset_start);
bad_hunk_count++;
break;
}
if (*patch_line != ' ') { /* '-' */
continue;
}
}
if (dst_cur_line == dst_last_line)
break;
fputs(patch_line + 1, dst_stream);
dst_cur_line++;
} /* end of while loop handling one hunk */
} /* end of while loop handling one file */
/* Cleanup last patched file */
if (copy_trailing_lines_flag) {
copy_lines(src_stream, dst_stream, (unsigned)(-1));
}
if (src_stream) {
fclose(src_stream);
}
fclose(dst_stream);
if (bad_hunk_count) {
ret = 1;
bb_error_msg("%u out of %u hunk FAILED", bad_hunk_count, hunk_count);
} else {
/* It worked, we can remove the backup */
if (backup_filename) {
unlink(backup_filename);
}
if (!(opt & OPT_dry_run)
&& ((dst_cur_line == 0) || (dst_beg_line == 0))
) {
/* The new patched file is empty, remove it */
xunlink(new_filename);
// /* old_filename and new_filename may be the same file */
// unlink(old_filename);
}
}
free(backup_filename);
//free(old_filename);
free(new_filename);
} /* end of "while there are patch lines" */
quit:
/* 0 = SUCCESS
* 1 = Some hunks failed
* 2 = More serious problems (exited earlier)
*/
return ret;
}
+20 -7
View File
@@ -61,6 +61,10 @@
#include "libbb.h"
#include "xregex.h"
enum {
OPT_in_place = 1 << 0,
};
/* Each sed command turns into one of these structures. */
typedef struct sed_cmd_s {
/* Ordered by alignment requirements: currently 36 bytes on x86 */
@@ -938,8 +942,11 @@ static void process_files(void)
if (matched) {
/* once matched, "n,xxx" range is dead, disabling it */
if (sed_cmd->beg_line > 0)
if (sed_cmd->beg_line > 0
&& !(option_mask32 & OPT_in_place) /* but not for -i */
) {
sed_cmd->beg_line = -2;
}
sed_cmd->in_match = !(
/* has the ending line come, or is this a single address command? */
(sed_cmd->end_line ?
@@ -985,6 +992,8 @@ static void process_files(void)
}
/* actual sedding */
//bb_error_msg("pattern_space:'%s' next_line:'%s' cmd:%c",
//pattern_space, next_line, sed_cmd->cmd);
switch (sed_cmd->cmd) {
/* Print line number */
@@ -1111,10 +1120,16 @@ static void process_files(void)
{
int len;
/* If no next line, jump to end of script and exit. */
/* http://www.gnu.org/software/sed/manual/sed.html:
* "Most versions of sed exit without printing anything
* when the N command is issued on the last line of
* a file. GNU sed prints pattern space before exiting
* unless of course the -n command switch has been
* specified. This choice is by design."
*/
if (next_line == NULL) {
free(next_line);
next_line = NULL;
goto discard_line;
//goto discard_line;
goto discard_commands; /* GNU behavior */
}
/* Append next_line, read new next_line. */
len = strlen(pattern_space);
@@ -1270,9 +1285,6 @@ static void add_cmd_block(char *cmdstr)
int sed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int sed_main(int argc UNUSED_PARAM, char **argv)
{
enum {
OPT_in_place = 1 << 0,
};
unsigned opt;
llist_t *opt_e, *opt_f;
int status = EXIT_SUCCESS;
@@ -1292,6 +1304,7 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
opt_e = opt_f = NULL;
opt_complementary = "e::f::" /* can occur multiple times */
"nn"; /* count -n */
/* -i must be first, to match OPT_in_place definition */
opt = getopt32(argv, "irne:f:", &opt_e, &opt_f,
&G.be_quiet); /* counter for -n */
//argc -= optind;
+10 -10
View File
@@ -504,20 +504,17 @@ static int init_text_buffer(char *fn)
}
#if ENABLE_FEATURE_VI_WIN_RESIZE
static void query_screen_dimensions(void)
static int query_screen_dimensions(void)
{
# if ENABLE_FEATURE_VI_ASK_TERMINAL
if (!G.get_rowcol_error)
G.get_rowcol_error =
# endif
get_terminal_width_height(STDIN_FILENO, &columns, &rows);
int err = get_terminal_width_height(STDIN_FILENO, &columns, &rows);
if (rows > MAX_SCR_ROWS)
rows = MAX_SCR_ROWS;
if (columns > MAX_SCR_COLS)
columns = MAX_SCR_COLS;
return err;
}
#else
# define query_screen_dimensions() ((void)0)
# define query_screen_dimensions() (0)
#endif
static void edit_file(char *fn)
@@ -536,7 +533,7 @@ static void edit_file(char *fn)
rows = 24;
columns = 80;
size = 0;
query_screen_dimensions();
IF_FEATURE_VI_ASK_TERMINAL(G.get_rowcol_error =) query_screen_dimensions();
#if ENABLE_FEATURE_VI_ASK_TERMINAL
if (G.get_rowcol_error /* TODO? && no input on stdin */) {
uint64_t k;
@@ -546,9 +543,12 @@ static void edit_file(char *fn)
if ((int32_t)k == KEYCODE_CURSOR_POS) {
uint32_t rc = (k >> 32);
columns = (rc & 0x7fff);
if (columns > MAX_SCR_COLS)
columns = MAX_SCR_COLS;
rows = ((rc >> 16) & 0x7fff);
if (rows > MAX_SCR_ROWS)
rows = MAX_SCR_ROWS;
}
query_screen_dimensions();
}
#endif
new_screen(rows, columns); // get memory for virtual screen
@@ -2797,7 +2797,7 @@ static void refresh(int full_screen)
int li, changed;
char *tp, *sp; // pointer into text[] and screen[]
if (ENABLE_FEATURE_VI_WIN_RESIZE) {
if (ENABLE_FEATURE_VI_WIN_RESIZE IF_FEATURE_VI_ASK_TERMINAL(&& !G.get_rowcol_error) ) {
unsigned c = columns, r = rows;
query_screen_dimensions();
full_screen |= (c - columns) | (r - rows);
+7 -3
View File
@@ -461,15 +461,19 @@ static int grep_file(FILE *file)
if (found)
print_line(gl->pattern, strlen(gl->pattern), linenum, ':');
} else while (1) {
unsigned start = gl->matched_range.rm_so;
unsigned end = gl->matched_range.rm_eo;
unsigned len = end - start;
char old = line[end];
line[end] = '\0';
print_line(line + gl->matched_range.rm_so,
end - gl->matched_range.rm_so,
linenum, ':');
/* Empty match is not printed: try "echo test | grep -o ''" */
if (len != 0)
print_line(line + start, len, linenum, ':');
if (old == '\0')
break;
line[end] = old;
if (len == 0)
end++;
#if !ENABLE_EXTRA_COMPAT
if (regexec(&gl->compiled_regex, line + end,
1, &gl->matched_range, REG_NOTBOL) != 0)
+1
View File
@@ -417,6 +417,7 @@ int xopen3(const char *pathname, int flags, int mode) FAST_FUNC;
int open_or_warn(const char *pathname, int flags) FAST_FUNC;
int open3_or_warn(const char *pathname, int flags, int mode) FAST_FUNC;
int open_or_warn_stdin(const char *pathname) FAST_FUNC;
int xopen_stdin(const char *pathname) FAST_FUNC;
void xrename(const char *oldpath, const char *newpath) FAST_FUNC;
int rename_or_warn(const char *oldpath, const char *newpath) FAST_FUNC;
off_t xlseek(int fd, off_t offset, int whence) FAST_FUNC;
+2 -2
View File
@@ -18,7 +18,7 @@
//config: and stopped using bootchartd stop.
//config:
//config:config FEATURE_BOOTCHARTD_BLOATED_HEADER
//config: bool "bootchartd"
//config: bool "Compatible, bloated header"
//config: default y
//config: depends on BOOTCHARTD
//config: help
@@ -35,7 +35,7 @@
//config: makes bootchartd applet to dump a subset of it.
//config:
//config:config FEATURE_BOOTCHARTD_CONFIG_FILE
//config: bool "bootchartd"
//config: bool "Support bootchartd.conf"
//config: default y
//config: depends on BOOTCHARTD
//config: help
+1 -1
View File
@@ -98,7 +98,7 @@ config FEATURE_USERNAME_COMPLETION
config FEATURE_EDITING_FANCY_PROMPT
bool "Fancy shell prompts"
default n
default y
depends on FEATURE_EDITING
help
Setting this option allows for prompts to use things like \w and
+2
View File
@@ -1765,11 +1765,13 @@ static void cmdedit_setwidth(unsigned w, int redraw_flg)
static void win_changed(int nsig)
{
int sv_errno = errno;
unsigned width;
get_terminal_width_height(0, &width, NULL);
cmdedit_setwidth(width, nsig /* - just a yes/no flag */);
if (nsig == SIGWINCH)
signal(SIGWINCH, win_changed); /* rearm ourself */
errno = sv_errno;
}
static int lineedit_read_key(char *read_key_buffer)
+9 -1
View File
@@ -4,7 +4,7 @@
*
* Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org>
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
/* A number of applets need to open a file for reading, where the filename
@@ -46,3 +46,11 @@ int FAST_FUNC open_or_warn_stdin(const char *filename)
return fd;
}
int FAST_FUNC xopen_stdin(const char *filename)
{
int fd = open_or_warn_stdin(filename);
if (fd >= 0)
return fd;
xfunc_die(); /* We already output an error message. */
}
+7 -7
View File
@@ -276,28 +276,28 @@ config FBSPLASH
config FLASHCP
bool "flashcp"
default y
default n # doesn't build on Ubuntu 8.04
help
The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7.
This utility is used to copy images into a MTD device.
config FLASH_LOCK
bool "flash_lock"
default y
default n # doesn't build on Ubuntu 8.04
help
The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This
utility locks part or all of the flash device.
config FLASH_UNLOCK
bool "flash_unlock"
default y
default n # doesn't build on Ubuntu 8.04
help
The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This
utility unlocks part or all of the flash device.
config FLASH_ERASEALL
bool "flash_eraseall"
default y
default n # doesn't build on Ubuntu 8.04
help
The flash_eraseall binary from mtd-utils as of git head c4c6a59eb.
This utility is used to erase the whole MTD device.
@@ -311,7 +311,7 @@ config IONICE
config INOTIFYD
bool "inotifyd"
default y
default n # doesn't build on Knoppix 5
help
Simple inotify daemon. Reports filesystem changes. Requires
kernel >= 2.6.13
@@ -549,7 +549,7 @@ config READAHEAD
config RFKILL
bool "rfkill"
default n
default n # doesn't build on Ubuntu 9.04
help
Enable/disable wireless devices.
@@ -588,7 +588,7 @@ config STRINGS
config TASKSET
bool "taskset"
default y
default n # doesn't build on some non-x86 targets (m68k)
help
Retrieve or set a processes's CPU affinity.
This requires sched_{g,s}etaffinity support in your libc.
+51 -33
View File
@@ -28,16 +28,6 @@ typedef struct module_info {
struct module_info *dnext, *dprev;
} module_info;
enum {
ARG_a = (1<<0), /* All modules, ignore mods in argv */
ARG_A = (1<<1), /* Only emit .ko that are newer than modules.dep file */
ARG_b = (1<<2), /* base directory when modules are in staging area */
ARG_e = (1<<3), /* with -F, print unresolved symbols */
ARG_F = (1<<4), /* System.map that contains the symbols */
ARG_n = (1<<5), /* dry-run, print to stdout only */
ARG_r = (1<<6) /* Compat dummy. Linux Makefile uses it */
};
static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM,
void *data, int depth UNUSED_PARAM)
{
@@ -58,7 +48,7 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA
*first = info;
info->dnext = info->dprev = info;
info->name = xasprintf("/%s", fname);
info->name = xstrdup(fname + 2); /* skip "./" */
info->modname = xstrdup(filename2modname(fname, modname));
for (ptr = image; ptr < image + len - 10; ptr++) {
if (strncmp(ptr, "depends=", 8) == 0) {
@@ -134,10 +124,44 @@ static void xfreopen_write(const char *file, FILE *f)
bb_perror_msg_and_die("can't open '%s'", file);
}
/* Usage:
* [-aAenv] [-C FILE or DIR] [-b BASE] [-F System.map] [VERSION] [MODFILES]...
* -a --all
* Probe all modules. Default if no MODFILES.
* -A --quick
* Check modules.dep's mtime against module files' mtimes.
* -b --basedir BASE
* Use $BASE/lib/modules/VERSION
* -C --config FILE or DIR
* Path to /etc/depmod.conf or /etc/depmod.d/
* -e --errsyms
* When combined with the -F option, this reports any symbols which
* which are not supplied by other modules or kernel.
* -F --filesyms System.map
* -n --dry-run
* Print modules.dep etc to standard output
* -v --verbose
* Print to stdout all the symbols each module depends on
* and the module's file name which provides that symbol.
* -r No-op
*
* So far we only support: [-rn] [-b BASE] [VERSION] [MODFILES]...
* -aAeF are accepted but ignored. -vC are not accepted.
*/
enum {
//OPT_a = (1 << 0), /* All modules, ignore mods in argv */
//OPT_A = (1 << 1), /* Only emit .ko that are newer than modules.dep file */
OPT_b = (1 << 2), /* base directory when modules are in staging area */
//OPT_e = (1 << 3), /* with -F, print unresolved symbols */
//OPT_F = (1 << 4), /* System.map that contains the symbols */
OPT_n = (1 << 5), /* dry-run, print to stdout only */
OPT_r = (1 << 6) /* Compat dummy. Linux Makefile uses it */
};
int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int depmod_main(int argc UNUSED_PARAM, char **argv)
{
module_info *modules = NULL, *m, *dep;
module_info *modules, *m, *dep;
const char *moddir_base = "/";
char *moddir, *version;
struct utsname uts;
@@ -152,36 +176,30 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
/* If a version is provided, then that kernel version's module directory
* is used, rather than the current kernel version (as returned by
* "uname -r"). */
if (*argv && sscanf(*argv, "%d.%d.%d", &tmp, &tmp, &tmp) == 3) {
if (*argv && sscanf(*argv, "%u.%u.%u", &tmp, &tmp, &tmp) == 3) {
version = *argv++;
} else {
uname(&uts);
version = uts.release;
}
moddir = concat_path_file(&CONFIG_DEFAULT_MODULES_DIR[1], version);
/* Scan modules */
if (*argv) {
char *modfile;
struct stat sb;
do {
modfile = concat_path_file(moddir, *argv);
xstat(modfile, &sb);
parse_module(modfile, &sb, &modules, 0);
free(modfile);
} while (*(++argv));
} else {
recursive_action(moddir, ACTION_RECURSE,
parse_module, NULL, &modules, 0);
}
/* Prepare for writing out the dep files */
xchdir(moddir);
if (ENABLE_FEATURE_CLEAN_UP)
free(moddir);
/* Scan modules */
modules = NULL;
if (*argv) {
do {
parse_module(*argv, /*sb (unused):*/ NULL, &modules, 0);
} while (*++argv);
} else {
recursive_action(".", ACTION_RECURSE,
parse_module, NULL, &modules, 0);
}
/* Generate dependency and alias files */
if (!(option_mask32 & ARG_n))
if (!(option_mask32 & OPT_n))
xfreopen_write(CONFIG_DEFAULT_DEPMOD_FILE, stdout);
for (m = modules; m != NULL; m = m->next) {
printf("%s:", m->name);
@@ -200,7 +218,7 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
}
#if ENABLE_FEATURE_MODUTILS_ALIAS
if (!(option_mask32 & ARG_n))
if (!(option_mask32 & OPT_n))
xfreopen_write("modules.alias", stdout);
for (m = modules; m != NULL; m = m->next) {
const char *fname = bb_basename(m->name);
@@ -218,7 +236,7 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
}
#endif
#if ENABLE_FEATURE_MODUTILS_SYMBOLS
if (!(option_mask32 & ARG_n))
if (!(option_mask32 & OPT_n))
xfreopen_write("modules.symbols", stdout);
for (m = modules; m != NULL; m = m->next) {
const char *fname = bb_basename(m->name);
+5 -5
View File
@@ -483,6 +483,11 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
opt = getopt32(argv, INSMOD_OPTS MODPROBE_OPTS INSMOD_ARGS);
argv += optind;
/* Goto modules location */
xchdir(CONFIG_DEFAULT_MODULES_DIR);
uname(&uts);
xchdir(uts.release);
if (opt & MODPROBE_OPT_LIST_ONLY) {
char name[MODULE_NAME_LEN];
char *colon, *tokens[2];
@@ -524,11 +529,6 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
return EXIT_SUCCESS;
}
/* Goto modules location */
xchdir(CONFIG_DEFAULT_MODULES_DIR);
uname(&uts);
xchdir(uts.release);
/* Retrieve module names of already loaded modules */
{
char *s;
+23 -39
View File
@@ -1,14 +1,12 @@
/* vi: set sw=4 ts=4: */
/*
* ip.c "ip" utility frontend.
* "ip" utility frontend.
*
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
*
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
*
* Changes:
*
* Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
* Bernhard Reutner-Fischer rewrote to use index_in_substr_array
*/
@@ -24,12 +22,14 @@
|| ENABLE_FEATURE_IP_TUNNEL \
|| ENABLE_FEATURE_IP_RULE
static int NORETURN ip_print_help(char **argv UNUSED_PARAM)
static int ip_print_help(char **argv UNUSED_PARAM)
{
bb_show_usage();
}
static int ip_do(int (*ip_func)(char **argv), char **argv)
typedef int (*ip_func_ptr_t)(char**);
static int ip_do(ip_func_ptr_t ip_func, char **argv)
{
argv = ip_parse_common_args(argv + 1);
return ip_func(argv);
@@ -78,45 +78,29 @@ int ip_main(int argc UNUSED_PARAM, char **argv)
static const char keywords[] ALIGN1 =
IF_FEATURE_IP_ADDRESS("address\0")
IF_FEATURE_IP_ROUTE("route\0")
IF_FEATURE_IP_ROUTE("r\0")
IF_FEATURE_IP_LINK("link\0")
IF_FEATURE_IP_TUNNEL("tunnel\0" "tunl\0")
IF_FEATURE_IP_TUNNEL("tunnel\0")
IF_FEATURE_IP_TUNNEL("tunl\0")
IF_FEATURE_IP_RULE("rule\0")
;
enum {
IF_FEATURE_IP_ADDRESS(IP_addr,)
IF_FEATURE_IP_ROUTE(IP_route,)
IF_FEATURE_IP_LINK(IP_link,)
IF_FEATURE_IP_TUNNEL(IP_tunnel, IP_tunl,)
IF_FEATURE_IP_RULE(IP_rule,)
IP_none
static const ip_func_ptr_t ip_func_ptrs[] = {
ip_print_help,
IF_FEATURE_IP_ADDRESS(do_ipaddr,)
IF_FEATURE_IP_ROUTE(do_iproute,)
IF_FEATURE_IP_ROUTE(do_iproute,)
IF_FEATURE_IP_LINK(do_iplink,)
IF_FEATURE_IP_TUNNEL(do_iptunnel,)
IF_FEATURE_IP_TUNNEL(do_iptunnel,)
IF_FEATURE_IP_RULE(do_iprule,)
};
int (*ip_func)(char**) = ip_print_help;
ip_func_ptr_t ip_func;
int key;
argv = ip_parse_common_args(argv + 1);
if (*argv) {
int key = index_in_substrings(keywords, *argv);
argv++;
#if ENABLE_FEATURE_IP_ADDRESS
if (key == IP_addr)
ip_func = do_ipaddr;
#endif
#if ENABLE_FEATURE_IP_ROUTE
if (key == IP_route)
ip_func = do_iproute;
#endif
#if ENABLE_FEATURE_IP_LINK
if (key == IP_link)
ip_func = do_iplink;
#endif
#if ENABLE_FEATURE_IP_TUNNEL
if (key == IP_tunnel || key == IP_tunl)
ip_func = do_iptunnel;
#endif
#if ENABLE_FEATURE_IP_RULE
if (key == IP_rule)
ip_func = do_iprule;
#endif
}
key = *argv ? index_in_substrings(keywords, *argv++) : -1;
ip_func = ip_func_ptrs[key + 1];
return ip_func(argv);
}
+1 -1
View File
@@ -34,7 +34,7 @@
//config:
//config:config NC_110_COMPAT
//config: bool "Netcat 1.10 compatibility (+2.5k)"
//config: default y
//config: default n # off specially for Rob
//config: depends on NC
//config: help
//config: This option makes nc closely follow original nc-1.10.
+1 -1
View File
@@ -50,7 +50,7 @@ static void progress_meter(int flag)
}
bb_progress_update(&G.pmt, G.curfile, G.beg_range, G.transferred,
G.chunked ? 0 : G.content_len + G.beg_range);
G.chunked ? 0 : G.beg_range + G.transferred + G.content_len);
if (flag == 0) {
/* last call to progress_meter */
+4 -4
View File
@@ -686,10 +686,10 @@ static int topmem_sort(char *a, char *b)
n = offsetof(topmem_status_t, vsz) + (sort_field * sizeof(mem_t));
l = *(mem_t*)(a + n);
r = *(mem_t*)(b + n);
// if (l == r) {
// l = a->mapped_rw;
// r = b->mapped_rw;
// }
if (l == r) {
l = ((topmem_status_t*)a)->dirty;
r = ((topmem_status_t*)b)->dirty;
}
/* We want to avoid unsigned->signed and truncation errors */
/* l>r: -1, l=r: 0, l<r: 1 */
n = (l > r) ? -1 : (l != r);
+6 -1
View File
@@ -13,8 +13,13 @@ __build:
include scripts/Kbuild.include
# The filename Kbuild has precedence over Makefile
# bbox: we also try to include Kbuild file in obj tree first
kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, \
$(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, \
$(kbuild-dir)/Makefile \
) \
)
include scripts/Makefile.lib
+6 -1
View File
@@ -4,6 +4,8 @@ test $# -ge 2 || { echo "Syntax: $0 SRCTREE OBJTREE"; exit 1; }
# cd to objtree
cd -- "$2" || { echo "Syntax: $0 SRCTREE OBJTREE"; exit 1; }
# In separate objtree build, include/ might not exist yet
mkdir include 2>/dev/null
srctree="$1"
@@ -46,11 +48,13 @@ if test x"$new" != x"$old"; then
fi
# (Re)generate */Kbuild and */Config.in
find -type d | while read -r d; do
{ cd -- "$srctree" && find -type d; } | while read -r d; do
d="${d#./}"
src="$srctree/$d/Kbuild.src"
dst="$d/Kbuild"
if test -f "$src"; then
mkdir -p -- "$d" 2>/dev/null
#echo " CHK $dst"
s=`sed -n 's@^//kbuild:@@p' -- "$srctree/$d"/*.c`
@@ -70,6 +74,7 @@ find -type d | while read -r d; do
src="$srctree/$d/Config.src"
dst="$d/Config.in"
if test -f "$src"; then
mkdir -p -- "$d" 2>/dev/null
#echo " CHK $dst"
s=`sed -n 's@^//config:@@p' -- "$srctree/$d"/*.c`
+11
View File
@@ -0,0 +1,11 @@
#!/bin/sh
b=`basename $PWD`
test "${b#busybox}" != "$b" || { echo "Must be run in busybox tree"; exit 1; }
rm -rf ../testdir_make_O.$$
mkdir ../testdir_make_O.$$
odir=`cd ../testdir_make_O.$$ && pwd`
test -d "$odir" || exit 1
make O="$odir" $MAKEOPTS "$@" defconfig busybox 2>&1 | tee test_make_O.log
+1
View File
@@ -4515,6 +4515,7 @@ clear_traps(void)
INT_ON;
}
}
may_have_traps = 0;
}
/* Lives far away from here, needed for forkchild */
View File
File mode changed.
+1
View File
@@ -0,0 +1 @@
Bug detected: 0
+18
View File
@@ -0,0 +1,18 @@
bug() {
trap : exit
# Bug was causing sh to be run in subshell,
# as if this line is replaced with (sh -c ...; exit $?) &
# here:
sh -c 'echo REAL_CHILD=$$' &
echo PARENTS_IDEA_OF_CHILD=$!
wait # make sure bkgd shell completes
}
bug | {
while read varval; do
eval $varval
done
test x"$REAL_CHILD" != x"" \
&& test x"$REAL_CHILD" = x"$PARENTS_IDEA_OF_CHILD"
echo "Bug detected: $?"
}
+2 -2
View File
@@ -3901,8 +3901,6 @@ static void insert_bg_job(struct pipe *pi)
if (G_interactive_fd)
printf("[%d] %d %s\n", job->jobid, job->cmds[0].pid, job->cmdtext);
/* Last command's pid goes to $! */
G.last_bg_pid = job->cmds[job->num_cmds - 1].pid;
G.last_jobid = job->jobid;
}
@@ -4825,6 +4823,8 @@ static int run_list(struct pipe *pi)
if (G.run_list_level == 1)
insert_bg_job(pi);
#endif
/* Last command's pid goes to $! */
G.last_bg_pid = pi->cmds[pi->num_cmds - 1].pid;
G.last_exitcode = rcode = EXIT_SUCCESS;
debug_printf_exec(": cmd&: exitcode EXIT_SUCCESS\n");
} else {
+1
View File
@@ -0,0 +1 @@
Bug detected: 0
+18
View File
@@ -0,0 +1,18 @@
bug() {
trap : exit
# Bug was causing sh to be run in subshell,
# as if this line is replaced with (sh -c ...; exit $?) &
# here:
sh -c 'echo REAL_CHILD=$$' &
echo PARENTS_IDEA_OF_CHILD=$!
wait # make sure bkgd shell completes
}
bug | {
while read varval; do
eval $varval
done
test x"$REAL_CHILD" != x"" \
&& test x"$REAL_CHILD" = x"$PARENTS_IDEA_OF_CHILD"
echo "Bug detected: $?"
}
+6 -1
View File
@@ -428,9 +428,14 @@ shell_builtin_ulimit(char **argv)
val <<= l->factor_shift;
}
//bb_error_msg("opt %c val_str:'%s' val:%lld", opt_char, val_str, (long long)val);
/* from man bash: "If neither -H nor -S
* is specified, both the soft and hard
* limits are set. */
if (!opts)
opts = OPT_hard + OPT_soft;
if (opts & OPT_hard)
limit.rlim_max = val;
if ((opts & OPT_soft) || opts == 0)
if (opts & OPT_soft)
limit.rlim_cur = val;
//bb_error_msg("setrlimit(%d, %lld, %lld)", l->cmd, (long long)limit.rlim_cur, (long long)limit.rlim_max);
if (setrlimit(l->cmd, &limit) < 0) {
+29 -2
View File
@@ -4,7 +4,7 @@
. ./testing.sh
# testing "test name" "options" "expected result" "file input" "stdin"
# testing "test name" "commands" "expected result" "file input" "stdin"
# diff outputs date/time in the header, which should not be analysed
# NB: sed has tab character in s command!
@@ -100,9 +100,11 @@ testing "diff always takes context from old file" \
"abc\na c\ndef\n" \
"a c\n"
# testing "test name" "options" "expected result" "file input" "stdin"
# testing "test name" "commands" "expected result" "file input" "stdin"
# clean up
rm -rf diff1 diff2
mkdir diff1 diff2 diff2/subdir
echo qwe >diff1/-
echo asd >diff2/subdir/-
@@ -187,4 +189,29 @@ SKIP=
# clean up
rm -rf diff1 diff2
# NOT using directory structure from prev test...
mkdir diff1 diff2
echo qwe >diff1/-
echo rty >diff2/-
optional FEATURE_DIFF_DIR
testing "diff diff1 diff2/" \
"diff -ur diff1 diff2/ | $TRIM_TAB; diff -ur .///diff1 diff2//// | $TRIM_TAB" \
"\
--- diff1/-
+++ diff2/-
@@ -1 +1 @@
-qwe
+rty
--- .///diff1/-
+++ diff2////-
@@ -1 +1 @@
-qwe
+rty
" \
"" ""
SKIP=
# clean up
rm -rf diff1 diff2
exit $FAILCOUNT
+4
View File
@@ -98,5 +98,9 @@ testing "grep -o does not loop forever" \
'grep -o "[^/]*$"' \
"test\n" \
"" "/var/test\n"
testing "grep -o does not loop forever on zero-length match" \
'grep -o "" | head -n1' \
"" \
"" "test\n"
exit $FAILCOUNT
+10
View File
@@ -37,6 +37,16 @@ brw-rw---- 1 0 0 8,0 sda
"" ""
SKIP=
# continuing to use directory structure from prev test
optional STATIC FEATURE_MDEV_CONF FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME
testing "mdev deletes /block/sda" \
"env - PATH=$PATH ACTION=remove DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
ls -ln mdev.testdir/dev | $FILTER_LS" \
"\
" \
"" ""
SKIP=
# continuing to use directory structure from prev test
rm -rf mdev.testdir/dev/*
echo ".* 1:1 666" >mdev.testdir/etc/mdev.conf
+63 -11
View File
@@ -1,13 +1,13 @@
#!/bin/sh
# Copyright 2008 by Denys Vlasenko
# Licensed under GPL v2, see file LICENSE for details.
# Licensed under GPLv2, see file LICENSE in this source tree.
. ./testing.sh
# testing "test name" "options" "expected result" "file input" "stdin"
# testing "test name" "command(s)" "expected result" "file input" "stdin"
testing "patch with old_file == new_file" \
'patch; echo $?; cat input' \
'patch 2>&1; echo $?; cat input' \
"\
patching file input
0
@@ -29,7 +29,7 @@ zxc
" \
testing "patch with nonexistent old_file" \
'patch; echo $?; cat input' \
'patch 2>&1; echo $?; cat input' \
"\
patching file input
0
@@ -51,7 +51,7 @@ zxc
" \
testing "patch -R with nonexistent old_file" \
'patch -R; echo $?; cat input' \
'patch -R 2>&1; echo $?; cat input' \
"\
patching file input
0
@@ -75,9 +75,12 @@ zxc
testing "patch detects already applied hunk" \
'patch 2>&1; echo $?; cat input' \
"\
Possibly reversed hunk 1 at 2
Hunk 1 FAILED 1/1.
abc
+def
123
patching file input
patch: hunk #1 FAILED at 1
patch: 1 out of 1 hunk FAILED
1
abc
def
@@ -97,13 +100,15 @@ def
123
" \
# Currently fails (erroneously appends second "456" line):
false && testing "patch detects already applied hunk" \
testing "patch detects already applied hunk at the EOF" \
'patch 2>&1; echo $?; cat input' \
"\
Possibly reversed hunk 1 at 3
Hunk 1 FAILED 1/1.
abc
123
+456
patching file input
patch: hunk #1 FAILED at 2
patch: 1 out of 1 hunk FAILED
1
abc
123
@@ -123,6 +128,53 @@ abc
+456
" \
# testing "test name" "command(s)" "expected result" "file input" "stdin"
testing "patch -N ignores already applied hunk" \
'patch -N 2>&1; echo $?; cat input' \
"\
patching file input
0
abc
def
123
" \
"\
abc
def
123
" \
"\
--- input
+++ input
@@ -1,2 +1,3 @@
abc
+def
123
" \
# testing "test name" "command(s)" "expected result" "file input" "stdin"
testing "patch FILE PATCH" \
'cat >a.patch; patch input a.patch 2>&1; echo $?; cat input; rm a.patch' \
"\
patching file input
0
abc
def
123
" \
"\
abc
123
" \
"\
--- foo.old
+++ foo
@@ -1,2 +1,3 @@
abc
+def
123
" \
rm input.orig 2>/dev/null
exit $FAILCOUNT
+17 -4
View File
@@ -80,10 +80,18 @@ test x"$SKIP_KNOWN_BUGS" = x"" && {
# Query: how does this interact with no newline at EOF?
testing "sed n (flushes pattern space, terminates early)" "sed -e 'n;p'" \
"a\nb\nb\nc\n" "" "a\nb\nc\n"
# N does _not_ flush pattern space, therefore c is still in there @ script end.
testing "sed N (doesn't flush pattern space when terminating)" "sed -e 'N;p'" \
"a\nb\na\nb\nc\n" "" "a\nb\nc\n"
}
# non-GNU sed: N does _not_ flush pattern space, therefore c is eaten @ script end
# GNU sed: N flushes pattern space, therefore c is printed too @ script end
testing "sed N (flushes pattern space (GNU behavior))" "sed -e 'N;p'" \
"a\nb\na\nb\nc\n" "" "a\nb\nc\n"
testing "sed N test2" "sed ':a;N;s/\n/ /;ta'" \
"a b c\n" "" "a\nb\nc\n"
testing "sed N test3" "sed 'N;s/\n/ /'" \
"a b\nc\n" "" "a\nb\nc\n"
testing "sed address match newline" 'sed "/b/N;/b\\nc/i woo"' \
"a\nwoo\nb\nc\nd\n" "" "a\nb\nc\nd\n"
@@ -270,11 +278,16 @@ testing "sed a cmd ended by double backslash" \
| two \\
'
# fisrt three lines are deleted; 4th line is matched and printed by "2,3" and by "4" ranges
# first three lines are deleted; 4th line is matched and printed by "2,3" and by "4" ranges
testing "sed with N skipping lines past ranges on next cmds" \
"sed -n '1{N;N;d};1p;2,3p;3p;4p'" \
"4\n4\n" "" "1\n2\n3\n4\n"
testing "sed -i with address modifies all files, not only first" \
"cp input input2; sed -i -e '1s/foo/bar/' input input2 && cat input input2; rm input2" \
"bar\nbar\n" "foo\n" ""
# testing "description" "arguments" "result" "infile" "stdin"
exit $FAILCOUNT
+220 -215
View File
@@ -470,221 +470,6 @@ config FEATURE_USE_TERMIOS
will be unable to determine the current screen size, and will be
unable to move the cursor.
config VOLUMEID
bool #No description makes it a hidden option
default n
config FEATURE_VOLUMEID_EXT
bool "Ext filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_BTRFS
bool "btrfs filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_REISERFS
bool "Reiser filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_FAT
bool "fat filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_HFS
bool "hfs filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_JFS
bool "jfs filesystem"
default y
depends on VOLUMEID
help
TODO
### config FEATURE_VOLUMEID_UFS
### bool "ufs filesystem"
### default y
### depends on VOLUMEID
### help
### TODO
config FEATURE_VOLUMEID_XFS
bool "xfs filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_NTFS
bool "ntfs filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_ISO9660
bool "iso9660 filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_UDF
bool "udf filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_LUKS
bool "luks filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_LINUXSWAP
bool "linux swap filesystem"
default y
depends on VOLUMEID
help
TODO
### config FEATURE_VOLUMEID_LVM
### bool "lvm"
### default y
### depends on VOLUMEID
### help
### TODO
config FEATURE_VOLUMEID_CRAMFS
bool "cramfs filesystem"
default y
depends on VOLUMEID
help
TODO
### config FEATURE_VOLUMEID_HPFS
### bool "hpfs filesystem"
### default y
### depends on VOLUMEID
### help
### TODO
config FEATURE_VOLUMEID_ROMFS
bool "romfs filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_SYSV
bool "sysv filesystem"
default y
depends on VOLUMEID
help
TODO
### config FEATURE_VOLUMEID_MINIX
### bool "minix filesystem"
### default y
### depends on VOLUMEID
### help
### TODO
### These only detect partition tables - not used (yet?)
### config FEATURE_VOLUMEID_MAC
### bool "mac filesystem"
### default y
### depends on VOLUMEID
### help
### TODO
###
### config FEATURE_VOLUMEID_MSDOS
### bool "msdos filesystem"
### default y
### depends on VOLUMEID
### help
### TODO
config FEATURE_VOLUMEID_OCFS2
bool "ocfs2 filesystem"
default y
depends on VOLUMEID
help
TODO
### config FEATURE_VOLUMEID_HIGHPOINTRAID
### bool "highpoint raid"
### default y
### depends on VOLUMEID
### help
### TODO
### config FEATURE_VOLUMEID_ISWRAID
### bool "intel raid"
### default y
### depends on VOLUMEID
### help
### TODO
### config FEATURE_VOLUMEID_LSIRAID
### bool "lsi raid"
### default y
### depends on VOLUMEID
### help
### TODO
### config FEATURE_VOLUMEID_VIARAID
### bool "via raid"
### default y
### depends on VOLUMEID
### help
### TODO
### config FEATURE_VOLUMEID_SILICONRAID
### bool "silicon raid"
### default y
### depends on VOLUMEID
### help
### TODO
### config FEATURE_VOLUMEID_NVIDIARAID
### bool "nvidia raid"
### default y
### depends on VOLUMEID
### help
### TODO
### config FEATURE_VOLUMEID_PROMISERAID
### bool "promise raid"
### default y
### depends on VOLUMEID
### help
### TODO
config FEATURE_VOLUMEID_LINUXRAID
bool "linuxraid"
default y
depends on VOLUMEID
help
TODO
config MOUNT
bool "mount"
default y
@@ -937,4 +722,224 @@ config FEATURE_MTAB_SUPPORT
About the only reason to use this is if you've removed /proc from
your kernel.
config VOLUMEID
bool #No description makes it a hidden option
default n
menu "Filesystem/Volume identification"
depends on VOLUMEID
config FEATURE_VOLUMEID_EXT
bool "Ext filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_BTRFS
bool "btrfs filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_REISERFS
bool "Reiser filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_FAT
bool "fat filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_HFS
bool "hfs filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_JFS
bool "jfs filesystem"
default y
depends on VOLUMEID
help
TODO
### config FEATURE_VOLUMEID_UFS
### bool "ufs filesystem"
### default y
### depends on VOLUMEID
### help
### TODO
config FEATURE_VOLUMEID_XFS
bool "xfs filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_NTFS
bool "ntfs filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_ISO9660
bool "iso9660 filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_UDF
bool "udf filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_LUKS
bool "luks filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_LINUXSWAP
bool "linux swap filesystem"
default y
depends on VOLUMEID
help
TODO
### config FEATURE_VOLUMEID_LVM
### bool "lvm"
### default y
### depends on VOLUMEID
### help
### TODO
config FEATURE_VOLUMEID_CRAMFS
bool "cramfs filesystem"
default y
depends on VOLUMEID
help
TODO
### config FEATURE_VOLUMEID_HPFS
### bool "hpfs filesystem"
### default y
### depends on VOLUMEID
### help
### TODO
config FEATURE_VOLUMEID_ROMFS
bool "romfs filesystem"
default y
depends on VOLUMEID
help
TODO
config FEATURE_VOLUMEID_SYSV
bool "sysv filesystem"
default y
depends on VOLUMEID
help
TODO
### config FEATURE_VOLUMEID_MINIX
### bool "minix filesystem"
### default y
### depends on VOLUMEID
### help
### TODO
### These only detect partition tables - not used (yet?)
### config FEATURE_VOLUMEID_MAC
### bool "mac filesystem"
### default y
### depends on VOLUMEID
### help
### TODO
###
### config FEATURE_VOLUMEID_MSDOS
### bool "msdos filesystem"
### default y
### depends on VOLUMEID
### help
### TODO
config FEATURE_VOLUMEID_OCFS2
bool "ocfs2 filesystem"
default y
depends on VOLUMEID
help
TODO
### config FEATURE_VOLUMEID_HIGHPOINTRAID
### bool "highpoint raid"
### default y
### depends on VOLUMEID
### help
### TODO
### config FEATURE_VOLUMEID_ISWRAID
### bool "intel raid"
### default y
### depends on VOLUMEID
### help
### TODO
### config FEATURE_VOLUMEID_LSIRAID
### bool "lsi raid"
### default y
### depends on VOLUMEID
### help
### TODO
### config FEATURE_VOLUMEID_VIARAID
### bool "via raid"
### default y
### depends on VOLUMEID
### help
### TODO
### config FEATURE_VOLUMEID_SILICONRAID
### bool "silicon raid"
### default y
### depends on VOLUMEID
### help
### TODO
### config FEATURE_VOLUMEID_NVIDIARAID
### bool "nvidia raid"
### default y
### depends on VOLUMEID
### help
### TODO
### config FEATURE_VOLUMEID_PROMISERAID
### bool "promise raid"
### default y
### depends on VOLUMEID
### help
### TODO
config FEATURE_VOLUMEID_LINUXRAID
bool "linuxraid"
default y
depends on VOLUMEID
help
TODO
endmenu
endmenu
+18 -2
View File
@@ -9,9 +9,25 @@
#include "libbb.h"
#include <linux/input.h>
#ifndef SW_RFKILL_ALL
# define SW_RFKILL_ALL 3
#ifndef EV_SW
# define EV_SW 0x05
#endif
#ifndef EV_KEY
# define EV_KEY 0x01
#endif
#ifndef SW_LID
# define SW_LID 0x00
#endif
#ifndef SW_RFKILL_ALL
# define SW_RFKILL_ALL 0x03
#endif
#ifndef KEY_POWER
# define KEY_POWER 116 /* SC System Power Down */
#endif
#ifndef KEY_SLEEP
# define KEY_SLEEP 142 /* SC System Sleep */
#endif
/*
* acpid listens to ACPI events coming either in textual form
+1 -1
View File
@@ -2805,7 +2805,7 @@ list_devs_in_proc_partititons(void)
&ma, &mi, &sz, ptname) != 4)
continue;
for (s = ptname; *s; s++)
continue;
continue;
/* note: excluding '0': e.g. mmcblk0 is not a partition name! */
if (s[-1] >= '1' && s[-1] <= '9')
continue;
+3 -2
View File
@@ -132,6 +132,7 @@ static void make_device(char *path, int delete)
major = -1;
}
}
/* else: for delete, -1 still deletes the node, but < -1 suppresses that */
/* Determine device name, type, major and minor */
device_name = (char*) bb_basename(path);
@@ -279,7 +280,7 @@ static void make_device(char *path, int delete)
if (aliaslink == '!' && s == a+1) {
val = st;
/* "!": suppress node creation/deletion */
major = -1;
major = -2;
}
else if (aliaslink == '>' || aliaslink == '=') {
val = st;
@@ -379,7 +380,7 @@ static void make_device(char *path, int delete)
free(command);
}
if (delete && major >= 0) {
if (delete && major >= -1) {
if (ENABLE_FEATURE_MDEV_RENAME && alias) {
if (aliaslink == '>')
unlink(device_name);
+2 -2
View File
@@ -31,7 +31,7 @@ struct globals {
#define setTermSettings(fd, argp) do { \
if (ENABLE_FEATURE_USE_TERMIOS) tcsetattr(fd, TCSANOW, argp); \
} while(0)
} while (0)
#define getTermSettings(fd, argp) tcgetattr(fd, argp)
static void gotsig(int sig UNUSED_PARAM)
@@ -46,7 +46,7 @@ static void gotsig(int sig UNUSED_PARAM)
int more_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int more_main(int argc UNUSED_PARAM, char **argv)
{
int c = c; /* for gcc */
int c = c; /* for compiler */
int lines;
int input = 0;
int spaces = 0;