Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 1 | /* vi: set sw=4 ts=4: */ |
| 2 | /* |
| 3 | * busybox patch applet to handle the unified diff format. |
Glenn L McGrath | c6992fe | 2004-04-25 05:11:19 +0000 | [diff] [blame] | 4 | * Copyright (C) 2003 Glenn McGrath <bug1@iinet.net.au> |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 5 | * |
Bernhard Reutner-Fischer | ee9cf48 | 2005-10-27 06:59:05 +0000 | [diff] [blame] | 6 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 7 | * |
| 8 | * This applet is written to work with patches generated by GNU diff, |
| 9 | * where there is equivalent functionality busybox patch shall behave |
| 10 | * as per GNU patch. |
| 11 | * |
| 12 | * There is a SUSv3 specification for patch, however it looks to be |
| 13 | * incomplete, it doesnt even mention unified diff format. |
| 14 | * http://www.opengroup.org/onlinepubs/007904975/utilities/patch.html |
| 15 | * |
| 16 | * Issues |
| 17 | * - Non-interactive |
| 18 | * - Patches must apply cleanly or the hunk will fail. |
| 19 | * - Reject file isnt saved |
Eric Andersen | c7bda1c | 2004-03-15 08:29:22 +0000 | [diff] [blame] | 20 | * - |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 21 | */ |
| 22 | |
| 23 | #include <getopt.h> |
| 24 | #include <string.h> |
| 25 | #include <stdlib.h> |
| 26 | #include <unistd.h> |
| 27 | #include "busybox.h" |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 28 | |
"Vladimir N. Oleynik" | dfe6e74 | 2006-01-31 09:44:04 +0000 | [diff] [blame] | 29 | static unsigned int copy_lines(FILE *src_stream, FILE *dest_stream, const unsigned int lines_count) |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 30 | { |
"Vladimir N. Oleynik" | dfe6e74 | 2006-01-31 09:44:04 +0000 | [diff] [blame] | 31 | unsigned int i = 0; |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 32 | |
| 33 | while (src_stream && (i < lines_count)) { |
| 34 | char *line; |
Denis Vlasenko | 2d5ca60 | 2006-10-12 22:43:20 +0000 | [diff] [blame] | 35 | line = xmalloc_fgets(src_stream); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 36 | if (line == NULL) { |
| 37 | break; |
| 38 | } |
| 39 | if (fputs(line, dest_stream) == EOF) { |
Denis Vlasenko | e1a0d48 | 2006-10-20 13:28:22 +0000 | [diff] [blame] | 40 | bb_perror_msg_and_die("error writing to new file"); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 41 | } |
| 42 | free(line); |
Eric Andersen | c7bda1c | 2004-03-15 08:29:22 +0000 | [diff] [blame] | 43 | |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 44 | i++; |
| 45 | } |
Denis Vlasenko | 079f8af | 2006-11-27 16:49:31 +0000 | [diff] [blame] | 46 | return i; |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 47 | } |
| 48 | |
| 49 | /* If patch_level is -1 it will remove all directory names |
| 50 | * char *line must be greater than 4 chars |
| 51 | * returns NULL if the file doesnt exist or error |
| 52 | * returns malloc'ed filename |
| 53 | */ |
| 54 | |
"Vladimir N. Oleynik" | dfe6e74 | 2006-01-31 09:44:04 +0000 | [diff] [blame] | 55 | static char *extract_filename(char *line, int patch_level) |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 56 | { |
Rob Landley | baa89b3 | 2006-05-07 21:10:06 +0000 | [diff] [blame] | 57 | char *temp, *filename_start_ptr = line + 4; |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 58 | int i; |
| 59 | |
| 60 | /* Terminate string at end of source filename */ |
Rob Landley | baa89b3 | 2006-05-07 21:10:06 +0000 | [diff] [blame] | 61 | temp = strchr(filename_start_ptr, '\t'); |
| 62 | if (temp) *temp = 0; |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 63 | |
Rob Landley | baa89b3 | 2006-05-07 21:10:06 +0000 | [diff] [blame] | 64 | /* skip over (patch_level) number of leading directories */ |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 65 | for (i = 0; i < patch_level; i++) { |
Rob Landley | baa89b3 | 2006-05-07 21:10:06 +0000 | [diff] [blame] | 66 | if(!(temp = strchr(filename_start_ptr, '/'))) break; |
| 67 | filename_start_ptr = temp + 1; |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 68 | } |
| 69 | |
Denis Vlasenko | 079f8af | 2006-11-27 16:49:31 +0000 | [diff] [blame] | 70 | return xstrdup(filename_start_ptr); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 71 | } |
| 72 | |
| 73 | static int file_doesnt_exist(const char *filename) |
| 74 | { |
| 75 | struct stat statbuf; |
Denis Vlasenko | 079f8af | 2006-11-27 16:49:31 +0000 | [diff] [blame] | 76 | return stat(filename, &statbuf); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 77 | } |
| 78 | |
Rob Landley | dfba741 | 2006-03-06 20:47:33 +0000 | [diff] [blame] | 79 | int patch_main(int argc, char **argv) |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 80 | { |
"Vladimir N. Oleynik" | dfe6e74 | 2006-01-31 09:44:04 +0000 | [diff] [blame] | 81 | int patch_level = -1; |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 82 | char *patch_line; |
Rob Landley | 078bacf | 2005-09-01 03:02:23 +0000 | [diff] [blame] | 83 | int ret; |
| 84 | FILE *patch_file = NULL; |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 85 | |
Rob Landley | 078bacf | 2005-09-01 03:02:23 +0000 | [diff] [blame] | 86 | { |
| 87 | char *p, *i; |
Denis Vlasenko | 67b23e6 | 2006-10-03 21:00:06 +0000 | [diff] [blame] | 88 | ret = getopt32(argc, argv, "p:i:", &p, &i); |
Rob Landley | 078bacf | 2005-09-01 03:02:23 +0000 | [diff] [blame] | 89 | if (ret & 1) |
Denis Vlasenko | 1385899 | 2006-10-08 12:49:22 +0000 | [diff] [blame] | 90 | patch_level = xatol_range(p, -1, USHRT_MAX); |
Rob Landley | 078bacf | 2005-09-01 03:02:23 +0000 | [diff] [blame] | 91 | if (ret & 2) { |
Rob Landley | d921b2e | 2006-08-03 15:41:12 +0000 | [diff] [blame] | 92 | patch_file = xfopen(i, "r"); |
Bernhard Reutner-Fischer | 554a9ff | 2005-10-10 13:34:19 +0000 | [diff] [blame] | 93 | } else { |
| 94 | patch_file = stdin; |
Rob Landley | 078bacf | 2005-09-01 03:02:23 +0000 | [diff] [blame] | 95 | } |
| 96 | ret = 0; |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 97 | } |
| 98 | |
Denis Vlasenko | 2d5ca60 | 2006-10-12 22:43:20 +0000 | [diff] [blame] | 99 | patch_line = xmalloc_fgets(patch_file); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 100 | while (patch_line) { |
| 101 | FILE *src_stream; |
| 102 | FILE *dst_stream; |
| 103 | char *original_filename; |
| 104 | char *new_filename; |
| 105 | char *backup_filename; |
| 106 | unsigned int src_cur_line = 1; |
| 107 | unsigned int dest_cur_line = 0; |
| 108 | unsigned int dest_beg_line; |
| 109 | unsigned int bad_hunk_count = 0; |
| 110 | unsigned int hunk_count = 0; |
| 111 | char copy_trailing_lines_flag = 0; |
| 112 | |
| 113 | /* Skip everything upto the "---" marker |
| 114 | * No need to parse the lines "Only in <dir>", and "diff <args>" |
| 115 | */ |
| 116 | while (patch_line && strncmp(patch_line, "--- ", 4) != 0) { |
| 117 | free(patch_line); |
Denis Vlasenko | 2d5ca60 | 2006-10-12 22:43:20 +0000 | [diff] [blame] | 118 | patch_line = xmalloc_fgets(patch_file); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 119 | } |
Denis Vlasenko | ab24e18 | 2006-11-30 16:41:15 +0000 | [diff] [blame] | 120 | /* FIXME: patch_line NULL check?? */ |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 121 | |
| 122 | /* Extract the filename used before the patch was generated */ |
| 123 | original_filename = extract_filename(patch_line, patch_level); |
| 124 | free(patch_line); |
| 125 | |
Denis Vlasenko | 2d5ca60 | 2006-10-12 22:43:20 +0000 | [diff] [blame] | 126 | patch_line = xmalloc_fgets(patch_file); |
Denis Vlasenko | ab24e18 | 2006-11-30 16:41:15 +0000 | [diff] [blame] | 127 | /* FIXME: NULL check?? */ |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 128 | if (strncmp(patch_line, "+++ ", 4) != 0) { |
| 129 | ret = 2; |
Denis Vlasenko | e1a0d48 | 2006-10-20 13:28:22 +0000 | [diff] [blame] | 130 | bb_error_msg("invalid patch"); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 131 | continue; |
| 132 | } |
| 133 | new_filename = extract_filename(patch_line, patch_level); |
| 134 | free(patch_line); |
| 135 | |
| 136 | if (file_doesnt_exist(new_filename)) { |
| 137 | char *line_ptr; |
| 138 | /* Create leading directories */ |
| 139 | line_ptr = strrchr(new_filename, '/'); |
| 140 | if (line_ptr) { |
| 141 | *line_ptr = '\0'; |
| 142 | bb_make_directory(new_filename, -1, FILEUTILS_RECUR); |
| 143 | *line_ptr = '/'; |
| 144 | } |
Rob Landley | d921b2e | 2006-08-03 15:41:12 +0000 | [diff] [blame] | 145 | dst_stream = xfopen(new_filename, "w+"); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 146 | backup_filename = NULL; |
| 147 | } else { |
| 148 | backup_filename = xmalloc(strlen(new_filename) + 6); |
| 149 | strcpy(backup_filename, new_filename); |
| 150 | strcat(backup_filename, ".orig"); |
| 151 | if (rename(new_filename, backup_filename) == -1) { |
Denis Vlasenko | a6dbb08 | 2006-10-12 19:29:44 +0000 | [diff] [blame] | 152 | bb_perror_msg_and_die("cannot create file %s", |
Bernhard Reutner-Fischer | 554a9ff | 2005-10-10 13:34:19 +0000 | [diff] [blame] | 153 | backup_filename); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 154 | } |
Rob Landley | d921b2e | 2006-08-03 15:41:12 +0000 | [diff] [blame] | 155 | dst_stream = xfopen(new_filename, "w"); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 156 | } |
| 157 | |
| 158 | if ((backup_filename == NULL) || file_doesnt_exist(original_filename)) { |
| 159 | src_stream = NULL; |
| 160 | } else { |
| 161 | if (strcmp(original_filename, new_filename) == 0) { |
Rob Landley | d921b2e | 2006-08-03 15:41:12 +0000 | [diff] [blame] | 162 | src_stream = xfopen(backup_filename, "r"); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 163 | } else { |
Rob Landley | d921b2e | 2006-08-03 15:41:12 +0000 | [diff] [blame] | 164 | src_stream = xfopen(original_filename, "r"); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 165 | } |
| 166 | } |
| 167 | |
| 168 | printf("patching file %s\n", new_filename); |
| 169 | |
| 170 | /* Handle each hunk */ |
Denis Vlasenko | 2d5ca60 | 2006-10-12 22:43:20 +0000 | [diff] [blame] | 171 | patch_line = xmalloc_fgets(patch_file); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 172 | while (patch_line) { |
| 173 | unsigned int count; |
| 174 | unsigned int src_beg_line; |
| 175 | unsigned int unused; |
| 176 | unsigned int hunk_offset_start = 0; |
| 177 | int hunk_error = 0; |
| 178 | |
| 179 | /* This bit should be improved */ |
| 180 | if ((sscanf(patch_line, "@@ -%d,%d +%d,%d @@", &src_beg_line, &unused, &dest_beg_line, &unused) != 4) && |
| 181 | (sscanf(patch_line, "@@ -%d,%d +%d @@", &src_beg_line, &unused, &dest_beg_line) != 3) && |
| 182 | (sscanf(patch_line, "@@ -%d +%d,%d @@", &src_beg_line, &dest_beg_line, &unused) != 3)) { |
| 183 | /* No more hunks for this file */ |
| 184 | break; |
| 185 | } |
| 186 | free(patch_line); |
| 187 | hunk_count++; |
| 188 | |
| 189 | if (src_beg_line && dest_beg_line) { |
| 190 | /* Copy unmodified lines upto start of hunk */ |
| 191 | /* src_beg_line will be 0 if its a new file */ |
| 192 | count = src_beg_line - src_cur_line; |
| 193 | if (copy_lines(src_stream, dst_stream, count) != count) { |
Denis Vlasenko | e1a0d48 | 2006-10-20 13:28:22 +0000 | [diff] [blame] | 194 | bb_error_msg_and_die("bad src file"); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 195 | } |
| 196 | src_cur_line += count; |
| 197 | dest_cur_line += count; |
| 198 | copy_trailing_lines_flag = 1; |
| 199 | } |
| 200 | hunk_offset_start = src_cur_line; |
| 201 | |
Denis Vlasenko | 2d5ca60 | 2006-10-12 22:43:20 +0000 | [diff] [blame] | 202 | while ((patch_line = xmalloc_fgets(patch_file)) != NULL) { |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 203 | if ((*patch_line == '-') || (*patch_line == ' ')) { |
| 204 | char *src_line = NULL; |
| 205 | if (src_stream) { |
Denis Vlasenko | 2d5ca60 | 2006-10-12 22:43:20 +0000 | [diff] [blame] | 206 | src_line = xmalloc_fgets(src_stream); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 207 | if (!src_line) { |
| 208 | hunk_error++; |
| 209 | break; |
| 210 | } else { |
| 211 | src_cur_line++; |
| 212 | } |
| 213 | if (strcmp(src_line, patch_line + 1) != 0) { |
Denis Vlasenko | e1a0d48 | 2006-10-20 13:28:22 +0000 | [diff] [blame] | 214 | bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 215 | hunk_error++; |
| 216 | free(patch_line); |
Denis Vlasenko | f7583d8 | 2006-12-17 00:33:29 +0000 | [diff] [blame^] | 217 | patch_line = NULL; |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 218 | break; |
| 219 | } |
| 220 | free(src_line); |
| 221 | } |
| 222 | if (*patch_line == ' ') { |
| 223 | fputs(patch_line + 1, dst_stream); |
| 224 | dest_cur_line++; |
| 225 | } |
| 226 | } else if (*patch_line == '+') { |
| 227 | fputs(patch_line + 1, dst_stream); |
| 228 | dest_cur_line++; |
| 229 | } else { |
| 230 | break; |
| 231 | } |
| 232 | free(patch_line); |
| 233 | } |
| 234 | if (hunk_error) { |
| 235 | bad_hunk_count++; |
| 236 | } |
| 237 | } |
| 238 | |
| 239 | /* Cleanup last patched file */ |
| 240 | if (copy_trailing_lines_flag) { |
| 241 | copy_lines(src_stream, dst_stream, -1); |
| 242 | } |
| 243 | if (src_stream) { |
| 244 | fclose(src_stream); |
| 245 | } |
| 246 | if (dst_stream) { |
| 247 | fclose(dst_stream); |
| 248 | } |
| 249 | if (bad_hunk_count) { |
| 250 | if (!ret) { |
| 251 | ret = 1; |
| 252 | } |
| 253 | bb_error_msg("%d out of %d hunk FAILED", bad_hunk_count, hunk_count); |
| 254 | } else { |
| 255 | /* It worked, we can remove the backup */ |
| 256 | if (backup_filename) { |
| 257 | unlink(backup_filename); |
| 258 | } |
| 259 | if ((dest_cur_line == 0) || (dest_beg_line == 0)) { |
| 260 | /* The new patched file is empty, remove it */ |
| 261 | if (unlink(new_filename) == -1) { |
Denis Vlasenko | a6dbb08 | 2006-10-12 19:29:44 +0000 | [diff] [blame] | 262 | bb_perror_msg_and_die("cannot remove file %s", new_filename); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 263 | } |
| 264 | if (unlink(original_filename) == -1) { |
Denis Vlasenko | a6dbb08 | 2006-10-12 19:29:44 +0000 | [diff] [blame] | 265 | bb_perror_msg_and_die("cannot remove original file %s", new_filename); |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 266 | } |
| 267 | } |
| 268 | } |
| 269 | } |
| 270 | |
Eric Andersen | c7bda1c | 2004-03-15 08:29:22 +0000 | [diff] [blame] | 271 | /* 0 = SUCCESS |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 272 | * 1 = Some hunks failed |
| 273 | * 2 = More serious problems |
| 274 | */ |
Denis Vlasenko | 079f8af | 2006-11-27 16:49:31 +0000 | [diff] [blame] | 275 | return ret; |
Glenn L McGrath | 655d814 | 2003-06-22 15:32:41 +0000 | [diff] [blame] | 276 | } |