Patch from Jason Schoon to add optional SIGUSR1 support to dd.

[oweals/busybox.git] / editors / patch.c

diff --git a/editors/patch.c b/editors/patch.c
index f283953974730210e4e71d819f5bffc507c34648..9a3740882410474165bf4ea765366dc83b798b97 100644 (file)
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -3,7 +3,7 @@
  *  busybox patch applet to handle the unified diff format.
  *  Copyright (C) 2003 Glenn McGrath <bug1@iinet.net.au>
  *
- *  Licensed under the GPL v2, see the file LICENSE in this tarball.
+ *  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
@@ -26,9 +26,9 @@
 #include <unistd.h>
 #include "busybox.h"
 
-static int copy_lines(FILE *src_stream, FILE *dest_stream, const unsigned int lines_count)
+static unsigned int copy_lines(FILE *src_stream, FILE *dest_stream, const unsigned int lines_count)
 {
-       int i = 0;
+       unsigned int i = 0;
 
        while (src_stream && (i < lines_count)) {
                char *line;
@@ -52,7 +52,7 @@ static int copy_lines(FILE *src_stream, FILE *dest_stream, const unsigned int li
  * returns malloc'ed filename
  */
 
-static unsigned char *extract_filename(char *line, unsigned short patch_level)
+static char *extract_filename(char *line, int patch_level)
 {
        char *filename_start_ptr = line + 4;
        int i;
@@ -88,9 +88,9 @@ static int file_doesnt_exist(const char *filename)
        return(stat(filename, &statbuf));
 }
 
-extern int patch_main(int argc, char **argv)
+int patch_main(int argc, char **argv)
 {
-       unsigned int patch_level = -1;
+       int patch_level = -1;
        char *patch_line;
        int ret;
        FILE *patch_file = NULL;
@@ -99,7 +99,7 @@ extern int patch_main(int argc, char **argv)
                char *p, *i;
                ret = bb_getopt_ulflags(argc, argv, "p:i:", &p, &i);
                if (ret & 1)
-                       patch_level = atoi(p);
+                       patch_level = bb_xgetlarg(p, 10, -1, USHRT_MAX);
                if (ret & 2) {
                        patch_file = bb_xfopen(i, "r");
                } else {