patch: shrink by Pascal Bellard <pascal.bellard AT ads-lu.com> (-80 bytes)

*: removal of #include <getopt.h>
This commit is contained in:
Denis Vlasenko 2008-03-23 22:55:25 +00:00
parent 324d26f9aa
commit c93b162248
31 changed files with 73 additions and 138 deletions

View File

@ -24,7 +24,6 @@
*/ */
#include <fnmatch.h> #include <fnmatch.h>
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
#include "unarchive.h" #include "unarchive.h"

View File

@ -10,7 +10,6 @@
* *
*/ */
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
#include <linux/kd.h> #include <linux/kd.h>

View File

@ -7,7 +7,6 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
#if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS #if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS

View File

@ -29,7 +29,6 @@
* - use xfunc_error_retval * - use xfunc_error_retval
*/ */
#include <getopt.h> /* struct option */
#include "libbb.h" #include "libbb.h"
#if ENABLE_FEATURE_ENV_LONG_OPTIONS #if ENABLE_FEATURE_ENV_LONG_OPTIONS

View File

@ -9,9 +9,6 @@
* owner/group, will probably modify bb_make_directory(...) * owner/group, will probably modify bb_make_directory(...)
*/ */
#include <libgen.h>
#include <getopt.h> /* struct option */
#include "libbb.h" #include "libbb.h"
#include "libcoreutils/coreutils.h" #include "libcoreutils/coreutils.h"

View File

@ -29,7 +29,6 @@
* 1. requires lstat (BSD) - how do you do it without? * 1. requires lstat (BSD) - how do you do it without?
*/ */
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
/* This is a NOEXEC applet. Be very careful! */ /* This is a NOEXEC applet. Be very careful! */

View File

@ -19,7 +19,6 @@
/* Nov 28, 2006 Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support. /* Nov 28, 2006 Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
*/ */
#include <getopt.h> /* struct option */
#include "libbb.h" #include "libbb.h"
/* This is a NOFORK applet. Be very careful! */ /* This is a NOFORK applet. Be very careful! */

View File

@ -13,10 +13,6 @@
* Size reduction and improved error checking. * Size reduction and improved error checking.
*/ */
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
#include <getopt.h> /* struct option */
#include "libbb.h" #include "libbb.h"
#include "libcoreutils/coreutils.h" #include "libcoreutils/coreutils.h"

View File

@ -17,7 +17,6 @@
/* This one provides -t (busybox's own build script needs it) */ /* This one provides -t (busybox's own build script needs it) */
#include "od_bloaty.c" #include "od_bloaty.c"
#else #else
#include <getopt.h>
#include "dump.h" #include "dump.h"

View File

@ -50,7 +50,6 @@ diff -u -a std bbox >bbox.diff || { echo Different!; sleep 1; }
*/ */
#include "libbb.h" #include "libbb.h"
#include <getopt.h>
#define assert(a) ((void)0) #define assert(a) ((void)0)

View File

@ -7,7 +7,6 @@
* Licensed under GPL v2 or later, see file LICENSE in this tarball for details. * Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
*/ */
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
int readlink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int readlink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;

View File

@ -30,8 +30,6 @@
* -u MASK umask. Set the umask of the program executed to MASK. * -u MASK umask. Set the umask of the program executed to MASK.
*/ */
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
struct globals { struct globals {

View File

@ -11,7 +11,6 @@
/* NB: we have a problem here with /proc/NN/exe usage, similar to /* NB: we have a problem here with /proc/NN/exe usage, similar to
* one fixed in killall/pidof */ * one fixed in killall/pidof */
#include <getopt.h>
#include <sys/resource.h> #include <sys/resource.h>
/* Override ENABLE_FEATURE_PIDFILE */ /* Override ENABLE_FEATURE_PIDFILE */

View File

@ -19,15 +19,11 @@
* - Reject file isnt saved * - Reject file isnt saved
*/ */
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
static unsigned int copy_lines(FILE *src_stream, FILE *dest_stream, const unsigned int lines_count) static unsigned copy_lines(FILE *src_stream, FILE *dest_stream, unsigned lines_count)
{ {
unsigned int i = 0; while (src_stream && lines_count) {
while (src_stream && (i < lines_count)) {
char *line; char *line;
line = xmalloc_fgets(src_stream); line = xmalloc_fgets(src_stream);
if (line == NULL) { if (line == NULL) {
@ -37,60 +33,54 @@ static unsigned int copy_lines(FILE *src_stream, FILE *dest_stream, const unsign
bb_perror_msg_and_die("error writing to new file"); bb_perror_msg_and_die("error writing to new file");
} }
free(line); free(line);
lines_count--;
i++;
} }
return i; return lines_count;
} }
/* If patch_level is -1 it will remove all directory names /* If patch_level is -1 it will remove all directory names
* char *line must be greater than 4 chars * char *line must be greater than 4 chars
* returns NULL if the file doesnt exist or error * returns NULL if the file doesnt exist or error
* returns malloc'ed filename * returns malloc'ed filename
* NB: frees 1st argument!
*/ */
static char *extract_filename_and_free_line(char *line, int patch_level)
static char *extract_filename(char *line, int patch_level)
{ {
char *temp, *filename_start_ptr = line + 4; char *temp, *filename_start_ptr = line + 4;
int i;
/* Terminate string at end of source filename */ /* Terminate string at end of source filename */
temp = strchrnul(filename_start_ptr, '\t'); temp = strchrnul(filename_start_ptr, '\t');
*temp = '\0'; *temp = '\0';
/* Skip over (patch_level) number of leading directories */ /* Skip over (patch_level) number of leading directories */
if (patch_level == -1) while (patch_level--) {
patch_level = INT_MAX;
for (i = 0; i < patch_level; i++) {
temp = strchr(filename_start_ptr, '/'); temp = strchr(filename_start_ptr, '/');
if (!temp) if (!temp)
break; break;
filename_start_ptr = temp + 1; filename_start_ptr = temp + 1;
} }
return xstrdup(filename_start_ptr); temp = xstrdup(filename_start_ptr);
free(line);
return temp;
} }
int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int patch_main(int argc ATTRIBUTE_UNUSED, char **argv) int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
{ {
int patch_level = -1;
char *patch_line;
int ret;
FILE *patch_file = NULL;
struct stat saved_stat; struct stat saved_stat;
char *patch_line;
FILE *patch_file;
int patch_level;
int ret = 0;
xfunc_error_retval = 2;
{ {
char *p, *i; const char *p = "-1";
ret = getopt32(argv, "p:i:", &p, &i); const char *i = "-"; /* compat */
if (ret & 1) getopt32(argv, "p:i:", &p, &i);
patch_level = xatol_range(p, -1, USHRT_MAX); patch_level = xatoi(p); /* can be negative! */
if (ret & 2) { patch_file = xfopen_stdin(i);
patch_file = xfopen(i, "r");
} else {
patch_file = stdin;
}
ret = 0;
} }
patch_line = xmalloc_getline(patch_file); patch_line = xmalloc_getline(patch_file);
@ -100,38 +90,33 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
char *original_filename; char *original_filename;
char *new_filename; char *new_filename;
char *backup_filename; char *backup_filename;
unsigned int src_cur_line = 1; unsigned src_cur_line = 1;
unsigned int dest_cur_line = 0; unsigned dest_cur_line = 0;
unsigned int dest_beg_line; unsigned dest_beg_line;
unsigned int bad_hunk_count = 0; unsigned bad_hunk_count = 0;
unsigned int hunk_count = 0; unsigned hunk_count = 0;
char copy_trailing_lines_flag = 0; smallint copy_trailing_lines_flag = 0;
/* Skip everything upto the "---" marker /* Skip everything upto the "---" marker
* No need to parse the lines "Only in <dir>", and "diff <args>" * No need to parse the lines "Only in <dir>", and "diff <args>"
*/ */
while (patch_line && strncmp(patch_line, "--- ", 4) != 0) { while (strncmp(patch_line, "--- ", 4) != 0) {
free(patch_line); free(patch_line);
patch_line = xmalloc_getline(patch_file); patch_line = xmalloc_getline(patch_file);
if (!patch_line)
bb_error_msg_and_die("invalid patch");
} }
/* FIXME: patch_line NULL check?? */
/* Extract the filename used before the patch was generated */ /* Extract the filename used before the patch was generated */
original_filename = extract_filename(patch_line, patch_level); original_filename = extract_filename_and_free_line(patch_line, patch_level);
free(patch_line);
patch_line = xmalloc_getline(patch_file); patch_line = xmalloc_getline(patch_file);
/* FIXME: NULL check?? */ if (!patch_line || strncmp(patch_line, "+++ ", 4) != 0)
if (strncmp(patch_line, "+++ ", 4) != 0) { bb_error_msg_and_die("invalid patch");
ret = 2; new_filename = extract_filename_and_free_line(patch_line, patch_level);
bb_error_msg("invalid patch");
continue;
}
new_filename = extract_filename(patch_line, patch_level);
free(patch_line);
/* Get access rights from the file to be patched, -1 file does not exist */ /* Get access rights from the file to be patched, -1 file does not exist */
if (stat(new_filename, &saved_stat)) { if (stat(new_filename, &saved_stat) != 0) {
char *line_ptr; char *line_ptr;
/* Create leading directories */ /* Create leading directories */
line_ptr = strrchr(new_filename, '/'); line_ptr = strrchr(new_filename, '/');
@ -140,53 +125,47 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
bb_make_directory(new_filename, -1, FILEUTILS_RECUR); bb_make_directory(new_filename, -1, FILEUTILS_RECUR);
*line_ptr = '/'; *line_ptr = '/';
} }
dst_stream = xfopen(new_filename, "w+");
backup_filename = NULL; backup_filename = NULL;
saved_stat.st_mode = 0644;
} else { } else {
backup_filename = xmalloc(strlen(new_filename) + 6); backup_filename = xasprintf("%s.orig", new_filename);
strcpy(backup_filename, new_filename);
strcat(backup_filename, ".orig");
xrename(new_filename, backup_filename); xrename(new_filename, backup_filename);
}
dst_stream = xfopen(new_filename, "w"); dst_stream = xfopen(new_filename, "w");
fchmod(fileno(dst_stream), saved_stat.st_mode); fchmod(fileno(dst_stream), saved_stat.st_mode);
}
if ((backup_filename == NULL) || stat(original_filename, &saved_stat)) {
src_stream = NULL; src_stream = NULL;
} else {
if (strcmp(original_filename, new_filename) == 0) { if (backup_filename && !stat(original_filename, &saved_stat)) {
src_stream = xfopen(backup_filename, "r"); src_stream = xfopen((strcmp(original_filename, new_filename)) ?
} else { original_filename : backup_filename, "r");
src_stream = xfopen(original_filename, "r");
}
} }
printf("patching file %s\n", new_filename); printf("patching file %s\n", new_filename);
/* Handle each hunk */ /* Handle all hunks for this file */
patch_line = xmalloc_fgets(patch_file); patch_line = xmalloc_fgets(patch_file);
while (patch_line) { while (patch_line) {
unsigned int count; unsigned count;
unsigned int src_beg_line; unsigned src_beg_line;
unsigned int unused; unsigned unused;
unsigned int hunk_offset_start = 0; unsigned hunk_offset_start = 0;
int hunk_error = 0; smallint hunk_error = 0;
/* This bit should be improved */ /* This bit should be improved */
if ((sscanf(patch_line, "@@ -%d,%d +%d,%d @@", &src_beg_line, &unused, &dest_beg_line, &unused) != 4) && if ((sscanf(patch_line, "@@ -%d,%d +%d,%d @@", &src_beg_line, &unused, &dest_beg_line, &unused) != 4)
(sscanf(patch_line, "@@ -%d,%d +%d @@", &src_beg_line, &unused, &dest_beg_line) != 3) && && (sscanf(patch_line, "@@ -%d,%d +%d @@", &src_beg_line, &unused, &dest_beg_line) != 3)
(sscanf(patch_line, "@@ -%d +%d,%d @@", &src_beg_line, &dest_beg_line, &unused) != 3)) { && (sscanf(patch_line, "@@ -%d +%d,%d @@", &src_beg_line, &dest_beg_line, &unused) != 3)
) {
/* No more hunks for this file */ /* No more hunks for this file */
break; break;
} }
free(patch_line);
hunk_count++; hunk_count++;
if (src_beg_line && dest_beg_line) { if (src_beg_line && dest_beg_line) {
/* Copy unmodified lines upto start of hunk */ /* Copy unmodified lines upto start of hunk */
/* src_beg_line will be 0 if its a new file */ /* src_beg_line will be 0 if it's a new file */
count = src_beg_line - src_cur_line; count = src_beg_line - src_cur_line;
if (copy_lines(src_stream, dst_stream, count) != count) { if (copy_lines(src_stream, dst_stream, count)) {
bb_error_msg_and_die("bad src file"); bb_error_msg_and_die("bad src file");
} }
src_cur_line += count; src_cur_line += count;
@ -195,27 +174,25 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
} }
hunk_offset_start = src_cur_line; hunk_offset_start = src_cur_line;
while ((patch_line = xmalloc_fgets(patch_file)) != NULL) { while (1) {
free(patch_line);
patch_line = xmalloc_fgets(patch_file);
if (patch_line == NULL) break;
if ((*patch_line == '-') || (*patch_line == ' ')) { if ((*patch_line == '-') || (*patch_line == ' ')) {
char *src_line = NULL; char *src_line = NULL;
if (src_stream) { if (src_stream) {
src_line = xmalloc_fgets(src_stream); src_line = xmalloc_fgets(src_stream);
if (!src_line) { if (src_line) {
hunk_error++; int diff = strcmp(src_line, patch_line + 1);
break;
} else {
src_cur_line++; src_cur_line++;
free(src_line);
if (diff) src_line = NULL;
} }
if (strcmp(src_line, patch_line + 1) != 0) { if (!src_line) {
bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start); bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start);
hunk_error++; hunk_error = 1;
free(patch_line);
/* Probably need to find next hunk, etc... */
/* but for now we just bail out */
patch_line = NULL;
break; break;
} }
free(src_line);
} }
if (*patch_line == ' ') { if (*patch_line == ' ') {
fputs(patch_line + 1, dst_stream); fputs(patch_line + 1, dst_stream);
@ -227,16 +204,15 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
} else { } else {
break; break;
} }
free(patch_line); } /* end of while loop handling one hunk */
}
if (hunk_error) { if (hunk_error) {
bad_hunk_count++; bad_hunk_count++;
} }
} } /* end of while loop handling one file */
/* Cleanup last patched file */ /* Cleanup last patched file */
if (copy_trailing_lines_flag) { if (copy_trailing_lines_flag) {
copy_lines(src_stream, dst_stream, -1); copy_lines(src_stream, dst_stream, (unsigned)(-1));
} }
if (src_stream) { if (src_stream) {
fclose(src_stream); fclose(src_stream);
@ -245,14 +221,13 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
fclose(dst_stream); fclose(dst_stream);
} }
if (bad_hunk_count) { if (bad_hunk_count) {
if (!ret) {
ret = 1; ret = 1;
} bb_error_msg("%u out of %u hunk FAILED", bad_hunk_count, hunk_count);
bb_error_msg("%d out of %d hunk FAILED", bad_hunk_count, hunk_count);
} else { } else {
/* It worked, we can remove the backup */ /* It worked, we can remove the backup */
if (backup_filename) { if (backup_filename) {
unlink(backup_filename); unlink(backup_filename);
free(backup_filename);
} }
if ((dest_cur_line == 0) || (dest_beg_line == 0)) { if ((dest_cur_line == 0) || (dest_beg_line == 0)) {
/* The new patched file is empty, remove it */ /* The new patched file is empty, remove it */
@ -261,11 +236,11 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
xunlink(original_filename); xunlink(original_filename);
} }
} }
} } /* end of "while there are patch lines" */
/* 0 = SUCCESS /* 0 = SUCCESS
* 1 = Some hunks failed * 1 = Some hunks failed
* 2 = More serious problems * 2 = More serious problems (exited earlier)
*/ */
return ret; return ret;
} }

View File

@ -9,8 +9,6 @@
#include "libbb.h" #include "libbb.h"
#if ENABLE_GETOPT_LONG #if ENABLE_GETOPT_LONG
#include <getopt.h>
static const char chpasswd_longopts[] ALIGN1 = static const char chpasswd_longopts[] ALIGN1 =
"encrypted\0" No_argument "e" "encrypted\0" No_argument "e"
"md5\0" No_argument "m" "md5\0" No_argument "m"

View File

@ -7,7 +7,6 @@
*/ */
#include <sched.h> #include <sched.h>
#include <getopt.h> /* optind */
#include "libbb.h" #include "libbb.h"
#ifndef _POSIX_PRIORITY_SCHEDULING #ifndef _POSIX_PRIORITY_SCHEDULING
#warning your system may be foobared #warning your system may be foobared

View File

@ -7,8 +7,6 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/ */
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
#define WHOLE_FILE 1 #define WHOLE_FILE 1

View File

@ -7,7 +7,6 @@
*/ */
#include <sched.h> #include <sched.h>
#include <getopt.h> /* optind */
#include "libbb.h" #include "libbb.h"
#if ENABLE_FEATURE_TASKSET_FANCY #if ENABLE_FEATURE_TASKSET_FANCY

View File

@ -13,7 +13,6 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
typedef struct ftp_host_info_s { typedef struct ftp_host_info_s {

View File

@ -19,7 +19,6 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#include <fnmatch.h> #include <fnmatch.h>
#include <getopt.h>
#include "libbb.h" #include "libbb.h"

View File

@ -12,7 +12,6 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
#include <getopt.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <arpa/inet.h> #include <arpa/inet.h>

View File

@ -25,7 +25,6 @@
* remove ridiculous amounts of bloat. * remove ridiculous amounts of bloat.
*/ */
#include <getopt.h>
#include <net/route.h> #include <net/route.h>
#include <net/if.h> #include <net/if.h>

View File

@ -8,7 +8,6 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/ */
#include <getopt.h>
#include <syslog.h> #include <syslog.h>
/* Override ENABLE_FEATURE_PIDFILE - ifupdown needs our pidfile to always exist */ /* Override ENABLE_FEATURE_PIDFILE - ifupdown needs our pidfile to always exist */

View File

@ -2,7 +2,6 @@
/* /*
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/ */
#include <getopt.h>
#include "common.h" #include "common.h"
#include "dhcpd.h" #include "dhcpd.h"

View File

@ -6,7 +6,6 @@
* *
*/ */
#include <getopt.h> /* for struct option */
#include "libbb.h" #include "libbb.h"
struct host_info { struct host_info {

View File

@ -7,8 +7,6 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/ */
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
#include "xregex.h" #include "xregex.h"

View File

@ -78,7 +78,6 @@
#include <glob.h> /* glob, of course */ #include <glob.h> /* glob, of course */
#include <getopt.h> /* should be pretty obvious */
/* #include <dmalloc.h> */ /* #include <dmalloc.h> */
#include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */ #include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */

View File

@ -9,7 +9,6 @@
* Licensed under GPLv2 or later, see file License in this tarball for details. * Licensed under GPLv2 or later, see file License in this tarball for details.
*/ */
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
#include "dump.h" #include "dump.h"

View File

@ -8,7 +8,6 @@
*/ */
#include <sys/utsname.h> #include <sys/utsname.h>
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
#include "rtc_.h" #include "rtc_.h"

View File

@ -7,8 +7,6 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
int losetup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int losetup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;

View File

@ -9,7 +9,6 @@
*/ */
#include <mntent.h> #include <mntent.h>
#include <getopt.h>
#include "libbb.h" #include "libbb.h"
/* ignored: -v -d -t -i */ /* ignored: -v -d -t -i */