4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
8 * NOTE! It does all its work in the index file, and only cares about
9 * the files in the working directory if you tell it to "merge" the
12 * Even when merging it always takes the source from the index, and
13 * uses the working tree as a "branch" for a 3-way merge.
19 // We default to the merge behaviour, since that's what most people would
22 // --check turns on checking that the working tree matches the
23 // files that are being modified, but doesn't apply the patch
24 // --stat does just a diffstat, and doesn't actually apply
25 // --show-files shows the directory changes
27 static int merge_patch
= 1;
28 static int check_index
= 0;
29 static int write_index
= 0;
30 static int diffstat
= 0;
33 static int show_files
= 0;
34 static const char apply_usage
[] = "git-apply [--stat] [--check] [--show-files] <patch>";
37 * For "diff-stat" like behaviour, we keep track of the biggest change
38 * we've seen, and the longest filename. That allows us to do simple
41 static int max_change
, max_len
;
44 * Various "current state", notably line numbers and what
45 * file (and how) we're patching right now.. The "is_xxxx"
46 * things are flags, where -1 means "don't know yet".
48 static int linenr
= 1;
51 unsigned long oldpos
, oldlines
;
52 unsigned long newpos
, newlines
;
55 struct fragment
*next
;
59 char *new_name
, *old_name
, *def_name
;
60 unsigned int old_mode
, new_mode
;
61 int is_rename
, is_copy
, is_new
, is_delete
;
62 int lines_added
, lines_deleted
;
63 struct fragment
*fragments
;
65 unsigned long resultsize
;
69 #define CHUNKSIZE (8192)
72 static void *read_patch_file(int fd
, unsigned long *sizep
)
74 unsigned long size
= 0, alloc
= CHUNKSIZE
;
75 void *buffer
= xmalloc(alloc
);
78 int nr
= alloc
- size
;
81 buffer
= xrealloc(buffer
, alloc
);
84 nr
= read(fd
, buffer
+ size
, nr
);
90 die("git-apply: read returned %s", strerror(errno
));
97 * Make sure that we have some slop in the buffer
98 * so that we can do speculative "memcmp" etc, and
99 * see to it that it is NUL-filled.
101 if (alloc
< size
+ SLOP
)
102 buffer
= xrealloc(buffer
, size
+ SLOP
);
103 memset(buffer
+ size
, 0, SLOP
);
107 static unsigned long linelen(const char *buffer
, unsigned long size
)
109 unsigned long len
= 0;
112 if (*buffer
++ == '\n')
118 static int is_dev_null(const char *str
)
120 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
126 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
128 if (c
== ' ' && !(terminate
& TERM_SPACE
))
130 if (c
== '\t' && !(terminate
& TERM_TAB
))
136 static char * find_name(const char *line
, char *def
, int p_value
, int terminate
)
139 const char *start
= line
;
148 if (name_terminate(start
, line
-start
, c
, terminate
))
152 if (c
== '/' && !--p_value
)
162 * Generally we prefer the shorter name, especially
163 * if the other one is just a variation of that with
164 * something else tacked on to the end (ie "file.orig"
168 int deflen
= strlen(def
);
169 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
173 name
= xmalloc(len
+ 1);
174 memcpy(name
, start
, len
);
181 * Get the name etc info from the --/+++ lines of a traditional patch header
183 * NOTE! This hardcodes "-p1" behaviour in filename detection.
185 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
186 * files, we can happily check the index for a match, but for creating a
187 * new file we should try to match whatever "patch" does. I have no idea.
189 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
194 first
+= 4; // skip "--- "
195 second
+= 4; // skip "+++ "
196 if (is_dev_null(first
)) {
198 patch
->is_delete
= 0;
199 name
= find_name(second
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
200 patch
->new_name
= name
;
201 } else if (is_dev_null(second
)) {
203 patch
->is_delete
= 1;
204 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
205 patch
->old_name
= name
;
207 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
208 name
= find_name(second
, name
, p_value
, TERM_SPACE
| TERM_TAB
);
209 patch
->old_name
= patch
->new_name
= name
;
212 die("unable to find filename in patch at line %d", linenr
);
215 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
221 * We're anal about diff header consistency, to make
222 * sure that we don't end up having strange ambiguous
223 * patches floating around.
225 * As a result, gitdiff_{old|new}name() will check
226 * their names against any previous information, just
229 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, const char *oldnew
)
234 if (!orig_name
&& !isnull
)
235 return find_name(line
, NULL
, 1, 0);
243 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name
, linenr
);
256 if (memcmp(line
, name
, len
) || line
[len
] != '\n')
260 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew
, linenr
);
264 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
266 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
, "old");
270 static int gitdiff_newname(const char *line
, struct patch
*patch
)
272 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
, "new");
276 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
278 patch
->old_mode
= strtoul(line
, NULL
, 8);
282 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
284 patch
->new_mode
= strtoul(line
, NULL
, 8);
288 static int gitdiff_delete(const char *line
, struct patch
*patch
)
290 patch
->is_delete
= 1;
291 patch
->old_name
= patch
->def_name
;
292 return gitdiff_oldmode(line
, patch
);
295 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
298 patch
->new_name
= patch
->def_name
;
299 return gitdiff_newmode(line
, patch
);
302 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
305 patch
->old_name
= find_name(line
, NULL
, 0, 0);
309 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
312 patch
->new_name
= find_name(line
, NULL
, 0, 0);
316 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
318 patch
->is_rename
= 1;
319 patch
->old_name
= find_name(line
, NULL
, 0, 0);
323 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
325 patch
->is_rename
= 1;
326 patch
->new_name
= find_name(line
, NULL
, 0, 0);
330 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
335 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
341 * This is normal for a diff that doesn't change anything: we'll fall through
342 * into the next diff. Tell the parser to break out.
344 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
349 static char *git_header_name(char *line
)
367 * We don't accept absolute paths (/dev/null) as possibly valid
373 * Accept a name only if it shows up twice, exactly the same
376 for (len
= 0 ; ; len
++) {
393 if (second
[len
] == '\n' && !memcmp(name
, second
, len
)) {
394 char *ret
= xmalloc(len
+ 1);
395 memcpy(ret
, name
, len
);
404 /* Verify that we recognize the lines following a git header */
405 static int parse_git_header(char *line
, int len
, unsigned int size
, struct patch
*patch
)
407 unsigned long offset
;
409 /* A git diff has explicit new/delete information, so we don't guess */
411 patch
->is_delete
= 0;
414 * Some things may not have the old name in the
415 * rest of the headers anywhere (pure mode changes,
416 * or removing or adding empty files), so we get
417 * the default name from the header.
419 patch
->def_name
= git_header_name(line
+ strlen("diff --git "));
424 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
425 static const struct opentry
{
427 int (*fn
)(const char *, struct patch
*);
429 { "@@ -", gitdiff_hdrend
},
430 { "--- ", gitdiff_oldname
},
431 { "+++ ", gitdiff_newname
},
432 { "old mode ", gitdiff_oldmode
},
433 { "new mode ", gitdiff_newmode
},
434 { "deleted file mode ", gitdiff_delete
},
435 { "new file mode ", gitdiff_newfile
},
436 { "copy from ", gitdiff_copysrc
},
437 { "copy to ", gitdiff_copydst
},
438 { "rename old ", gitdiff_renamesrc
},
439 { "rename new ", gitdiff_renamedst
},
440 { "rename from ", gitdiff_renamesrc
},
441 { "rename to ", gitdiff_renamedst
},
442 { "similarity index ", gitdiff_similarity
},
443 { "dissimilarity index ", gitdiff_dissimilarity
},
444 { "", gitdiff_unrecognized
},
448 len
= linelen(line
, size
);
449 if (!len
|| line
[len
-1] != '\n')
451 for (i
= 0; i
< sizeof(optable
) / sizeof(optable
[0]); i
++) {
452 const struct opentry
*p
= optable
+ i
;
453 int oplen
= strlen(p
->str
);
454 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
456 if (p
->fn(line
+ oplen
, patch
) < 0)
465 static int parse_num(const char *line
, unsigned long *p
)
471 *p
= strtoul(line
, &ptr
, 10);
475 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
476 unsigned long *p1
, unsigned long *p2
)
480 if (offset
< 0 || offset
>= len
)
485 digits
= parse_num(line
, p1
);
495 digits
= parse_num(line
+1, p2
);
507 if (memcmp(line
, expect
, ex
))
514 * Parse a unified diff fragment header of the
515 * form "@@ -a,b +c,d @@"
517 static int parse_fragment_header(char *line
, int len
, struct fragment
*fragment
)
521 if (!len
|| line
[len
-1] != '\n')
524 /* Figure out the number of lines in a fragment */
525 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
526 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
531 static int find_header(char *line
, unsigned long size
, int *hdrsize
, struct patch
*patch
)
533 unsigned long offset
, len
;
535 patch
->is_rename
= patch
->is_copy
= 0;
536 patch
->is_new
= patch
->is_delete
= -1;
537 patch
->old_mode
= patch
->new_mode
= 0;
538 patch
->old_name
= patch
->new_name
= NULL
;
539 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
540 unsigned long nextlen
;
542 len
= linelen(line
, size
);
546 /* Testing this early allows us to take a few shortcuts.. */
551 * Make sure we don't find any unconnected patch fragmants.
552 * That's a sign that we didn't find a header, and that a
553 * patch has become corrupted/broken up.
555 if (!memcmp("@@ -", line
, 4)) {
556 struct fragment dummy
;
557 if (parse_fragment_header(line
, len
, &dummy
) < 0)
559 error("patch fragment without header at line %d: %.*s", linenr
, len
-1, line
);
566 * Git patch? It might not have a real patch, just a rename
567 * or mode change, so we handle that specially
569 if (!memcmp("diff --git ", line
, 11)) {
570 int git_hdr_len
= parse_git_header(line
, len
, size
, patch
);
571 if (git_hdr_len
<= len
)
573 if (!patch
->old_name
&& !patch
->new_name
)
574 die("git diff header lacks filename information (line %d)", linenr
);
575 *hdrsize
= git_hdr_len
;
579 /** --- followed by +++ ? */
580 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
584 * We only accept unified patches, so we want it to
585 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
588 nextlen
= linelen(line
+ len
, size
- len
);
589 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
592 /* Ok, we'll consider it a patch */
593 parse_traditional_patch(line
, line
+len
, patch
);
594 *hdrsize
= len
+ nextlen
;
602 * Parse a unified diff. Note that this really needs
603 * to parse each fragment separately, since the only
604 * way to know the difference between a "---" that is
605 * part of a patch, and a "---" that starts the next
606 * patch is to look at the line counts..
608 static int parse_fragment(char *line
, unsigned long size
, struct patch
*patch
, struct fragment
*fragment
)
611 int len
= linelen(line
, size
), offset
;
612 unsigned long oldlines
, newlines
;
614 offset
= parse_fragment_header(line
, len
, fragment
);
617 oldlines
= fragment
->oldlines
;
618 newlines
= fragment
->newlines
;
620 if (patch
->is_new
< 0) {
621 patch
->is_new
= !oldlines
;
623 patch
->old_name
= NULL
;
625 if (patch
->is_delete
< 0) {
626 patch
->is_delete
= !newlines
;
628 patch
->new_name
= NULL
;
631 if (patch
->is_new
!= !oldlines
)
632 return error("new file depends on old contents");
633 if (patch
->is_delete
!= !newlines
) {
635 return error("deleted file still has contents");
636 fprintf(stderr
, "** warning: file %s becomes empty but is not deleted\n", patch
->new_name
);
639 /* Parse the thing.. */
644 for (offset
= len
; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
645 if (!oldlines
&& !newlines
)
647 len
= linelen(line
, size
);
648 if (!len
|| line
[len
-1] != '\n')
665 /* We allow "\ No newline at end of file" */
667 if (len
< 12 || memcmp(line
, "\\ No newline", 12))
672 patch
->lines_added
+= added
;
673 patch
->lines_deleted
+= deleted
;
677 static int parse_single_patch(char *line
, unsigned long size
, struct patch
*patch
)
679 unsigned long offset
= 0;
680 struct fragment
**fragp
= &patch
->fragments
;
682 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
683 struct fragment
*fragment
;
686 fragment
= xmalloc(sizeof(*fragment
));
687 memset(fragment
, 0, sizeof(*fragment
));
688 len
= parse_fragment(line
, size
, patch
, fragment
);
690 die("corrupt patch at line %d", linenr
);
692 fragment
->patch
= line
;
693 fragment
->size
= len
;
696 fragp
= &fragment
->next
;
705 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
707 int hdrsize
, patchsize
;
708 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
713 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
, size
- offset
- hdrsize
, patch
);
715 return offset
+ hdrsize
+ patchsize
;
718 const char pluses
[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
719 const char minuses
[]= "----------------------------------------------------------------------";
721 static void show_stats(struct patch
*patch
)
723 char *name
= patch
->old_name
;
724 int len
, max
, add
, del
, total
;
727 name
= patch
->new_name
;
730 * "scale" the filename
741 * scale the add/delete
747 add
= patch
->lines_added
;
748 del
= patch
->lines_deleted
;
751 total
= (total
* max
+ max_change
/ 2) / max_change
;
752 add
= (add
* max
+ max_change
/ 2) / max_change
;
754 printf(" %-*s |%5d %.*s%.*s\n",
755 len
, name
, patch
->lines_added
+ patch
->lines_deleted
,
756 add
, pluses
, del
, minuses
);
759 static int read_old_data(struct stat
*st
, const char *path
, void *buf
, unsigned long size
)
764 switch (st
->st_mode
& S_IFMT
) {
766 return readlink(path
, buf
, size
);
768 fd
= open(path
, O_RDONLY
);
770 return error("unable to open %s", path
);
773 int ret
= read(fd
, buf
+ got
, size
- got
);
791 static int find_offset(const char *buf
, unsigned long size
, const char *fragment
, unsigned long fragsize
, int line
)
794 unsigned long start
, backwards
, forwards
;
801 unsigned long offset
= 0;
803 while (offset
+ fragsize
<= size
) {
804 if (buf
[offset
++] == '\n') {
812 /* Exact line number? */
813 if (!memcmp(buf
+ start
, fragment
, fragsize
))
817 * There's probably some smart way to do this, but I'll leave
818 * that to the smart and beautiful people. I'm simple and stupid.
829 if (forwards
+ fragsize
> size
)
835 } while (backwards
&& buf
[backwards
-1] != '\n');
838 while (forwards
+ fragsize
<= size
) {
839 if (buf
[forwards
++] == '\n')
845 if (try + fragsize
> size
)
847 if (memcmp(buf
+ try, fragment
, fragsize
))
852 fprintf(stderr
, "Fragment applied at offset %d\n", n
);
857 * We should start searching forward and backward.
868 static int apply_one_fragment(struct buffer_desc
*desc
, struct fragment
*frag
)
870 char *buf
= desc
->buffer
;
871 const char *patch
= frag
->patch
;
872 int offset
, size
= frag
->size
;
873 char *old
= xmalloc(size
);
874 char *new = xmalloc(size
);
875 int oldsize
= 0, newsize
= 0;
878 int len
= linelen(patch
, size
);
885 * "plen" is how much of the line we should use for
886 * the actual patch data. Normally we just remove the
887 * first character on the line, but if the line is
888 * followed by "\ No newline", then we also remove the
889 * last one (which is the newline, of course).
892 if (len
> size
&& patch
[len
] == '\\')
897 memcpy(old
+ oldsize
, patch
+ 1, plen
);
901 /* Fall-through for ' ' */
903 memcpy(new + newsize
, patch
+ 1, plen
);
907 /* Ignore it, we already handled it */
916 offset
= find_offset(buf
, desc
->size
, old
, oldsize
, frag
->newpos
);
918 int diff
= newsize
- oldsize
;
919 unsigned long size
= desc
->size
+ diff
;
920 unsigned long alloc
= desc
->alloc
;
925 buf
= xrealloc(buf
, alloc
);
929 memmove(buf
+ offset
+ newsize
, buf
+ offset
+ oldsize
, size
- offset
- newsize
);
930 memcpy(buf
+ offset
, new, newsize
);
939 static int apply_fragments(struct buffer_desc
*desc
, struct patch
*patch
)
941 struct fragment
*frag
= patch
->fragments
;
944 if (apply_one_fragment(desc
, frag
) < 0)
945 return error("patch failed: %s:%d", patch
->old_name
, frag
->oldpos
);
951 static int apply_data(struct patch
*patch
, struct stat
*st
)
954 unsigned long size
, alloc
;
955 struct buffer_desc desc
;
960 if (patch
->old_name
) {
963 buf
= xmalloc(alloc
);
964 if (read_old_data(st
, patch
->old_name
, buf
, alloc
) != size
)
965 return error("read of %s failed", patch
->old_name
);
971 if (apply_fragments(&desc
, patch
) < 0)
973 patch
->result
= desc
.buffer
;
974 patch
->resultsize
= desc
.size
;
976 if (patch
->is_delete
&& patch
->resultsize
)
977 return error("removal patch leaves file contents");
982 static int check_patch(struct patch
*patch
)
985 const char *old_name
= patch
->old_name
;
986 const char *new_name
= patch
->new_name
;
991 if (lstat(old_name
, &st
) < 0)
992 return error("%s: %s", old_name
, strerror(errno
));
994 int pos
= cache_name_pos(old_name
, strlen(old_name
));
996 return error("%s: does not exist in index", old_name
);
997 changed
= ce_match_stat(active_cache
[pos
], &st
);
999 return error("%s: does not match index", old_name
);
1001 if (patch
->is_new
< 0)
1003 st
.st_mode
= ntohl(create_ce_mode(st
.st_mode
));
1004 if (!patch
->old_mode
)
1005 patch
->old_mode
= st
.st_mode
;
1006 if ((st
.st_mode
^ patch
->old_mode
) & S_IFMT
)
1007 return error("%s: wrong type", old_name
);
1008 if (st
.st_mode
!= patch
->old_mode
)
1009 fprintf(stderr
, "warning: %s has type %o, expected %o\n",
1010 old_name
, st
.st_mode
, patch
->old_mode
);
1013 if (new_name
&& (patch
->is_new
| patch
->is_rename
| patch
->is_copy
)) {
1014 if (check_index
&& cache_name_pos(new_name
, strlen(new_name
)) >= 0)
1015 return error("%s: already exists in index", new_name
);
1016 if (!lstat(new_name
, &st
))
1017 return error("%s: already exists in working directory", new_name
);
1018 if (errno
!= ENOENT
)
1019 return error("%s: %s", new_name
, strerror(errno
));
1020 if (!patch
->new_mode
)
1021 patch
->new_mode
= S_IFREG
| 0644;
1024 if (new_name
&& old_name
) {
1025 int same
= !strcmp(old_name
, new_name
);
1026 if (!patch
->new_mode
)
1027 patch
->new_mode
= patch
->old_mode
;
1028 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
)
1029 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1030 patch
->new_mode
, new_name
, patch
->old_mode
,
1031 same
? "" : " of ", same
? "" : old_name
);
1034 if (apply_data(patch
, &st
) < 0)
1035 return error("%s: patch does not apply", old_name
);
1039 static int check_patch_list(struct patch
*patch
)
1043 for (;patch
; patch
= patch
->next
)
1044 error
|= check_patch(patch
);
1048 static void show_file(int c
, unsigned int mode
, const char *name
)
1050 printf("%c %o %s\n", c
, mode
, name
);
1053 static void show_file_list(struct patch
*patch
)
1055 for (;patch
; patch
= patch
->next
) {
1056 if (patch
->is_rename
) {
1057 show_file('-', patch
->old_mode
, patch
->old_name
);
1058 show_file('+', patch
->new_mode
, patch
->new_name
);
1061 if (patch
->is_copy
|| patch
->is_new
) {
1062 show_file('+', patch
->new_mode
, patch
->new_name
);
1065 if (patch
->is_delete
) {
1066 show_file('-', patch
->old_mode
, patch
->old_name
);
1069 if (patch
->old_mode
&& patch
->new_mode
&& patch
->old_mode
!= patch
->new_mode
) {
1070 printf("M %o:%o %s\n", patch
->old_mode
, patch
->new_mode
, patch
->old_name
);
1073 printf("M %o %s\n", patch
->old_mode
, patch
->old_name
);
1077 static void stat_patch_list(struct patch
*patch
)
1079 int files
, adds
, dels
;
1081 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
1083 adds
+= patch
->lines_added
;
1084 dels
+= patch
->lines_deleted
;
1088 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files
, adds
, dels
);
1091 static void patch_stats(struct patch
*patch
)
1093 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
1095 if (lines
> max_change
)
1097 if (patch
->old_name
) {
1098 int len
= strlen(patch
->old_name
);
1102 if (patch
->new_name
) {
1103 int len
= strlen(patch
->new_name
);
1109 static void remove_file(struct patch
*patch
)
1112 if (remove_file_from_cache(patch
->old_name
) < 0)
1113 die("unable to remove %s from index", patch
->old_name
);
1115 unlink(patch
->old_name
);
1118 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
1121 struct cache_entry
*ce
;
1122 int namelen
= strlen(path
);
1123 unsigned ce_size
= cache_entry_size(namelen
);
1128 ce
= xmalloc(ce_size
);
1129 memset(ce
, 0, ce_size
);
1130 memcpy(ce
->name
, path
, namelen
);
1131 ce
->ce_mode
= create_ce_mode(mode
);
1132 ce
->ce_flags
= htons(namelen
);
1133 if (lstat(path
, &st
) < 0)
1134 die("unable to stat newly created file %s", path
);
1135 fill_stat_cache_info(ce
, &st
);
1136 if (write_sha1_file(buf
, size
, "blob", ce
->sha1
) < 0)
1137 die("unable to create backing store for newly created file %s", path
);
1138 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
1139 die("unable to add cache entry for %s", path
);
1142 static void create_file(struct patch
*patch
)
1144 const char *path
= patch
->new_name
;
1145 unsigned mode
= patch
->new_mode
;
1146 unsigned long size
= patch
->resultsize
;
1147 char *buf
= patch
->result
;
1150 mode
= S_IFREG
| 0644;
1151 if (S_ISREG(mode
)) {
1153 mode
= (mode
& 0100) ? 0777 : 0666;
1154 fd
= open(path
, O_WRONLY
| O_CREAT
| O_TRUNC
, mode
);
1156 die("unable to create file %s (%s)", path
, strerror(errno
));
1157 if (write(fd
, buf
, size
) != size
)
1158 die("unable to write file %s", path
);
1160 add_index_file(path
, mode
, buf
, size
);
1163 if (S_ISLNK(mode
)) {
1164 if (size
&& buf
[size
-1] == '\n')
1167 if (symlink(buf
, path
) < 0)
1168 die("unable to write symlink %s", path
);
1169 add_index_file(path
, mode
, buf
, size
);
1172 die("unable to write file mode %o", mode
);
1175 static void write_out_one_result(struct patch
*patch
)
1177 if (patch
->is_delete
> 0) {
1181 if (patch
->is_new
> 0 || patch
->is_copy
) {
1186 * Rename or modification boils down to the same
1187 * thing: remove the old, write the new
1193 static void write_out_results(struct patch
*list
)
1199 write_out_one_result(list
);
1204 static struct cache_file cache_file
;
1206 static int apply_patch(int fd
)
1209 unsigned long offset
, size
;
1210 char *buffer
= read_patch_file(fd
, &size
);
1211 struct patch
*list
= NULL
, **listp
= &list
;
1217 struct patch
*patch
;
1220 patch
= xmalloc(sizeof(*patch
));
1221 memset(patch
, 0, sizeof(*patch
));
1222 nr
= parse_chunk(buffer
+ offset
, size
, patch
);
1227 listp
= &patch
->next
;
1233 write_index
= check_index
&& apply
;
1235 newfd
= hold_index_file_for_update(&cache_file
, get_index_file());
1237 if (read_cache() < 0)
1238 die("unable to read index file");
1241 if ((check
|| apply
) && check_patch_list(list
) < 0)
1245 write_out_results(list
);
1248 if (write_cache(newfd
, active_cache
, active_nr
) ||
1249 commit_index_file(&cache_file
))
1250 die("Unable to write new cachefile");
1254 show_file_list(list
);
1257 stat_patch_list(list
);
1263 int main(int argc
, char **argv
)
1268 for (i
= 1; i
< argc
; i
++) {
1269 const char *arg
= argv
[i
];
1272 if (!strcmp(arg
, "-")) {
1277 if (!strcmp(arg
, "--no-merge")) {
1281 if (!strcmp(arg
, "--stat")) {
1286 if (!strcmp(arg
, "--check")) {
1291 if (!strcmp(arg
, "--index")) {
1295 if (!strcmp(arg
, "--show-files")) {
1299 fd
= open(arg
, O_RDONLY
);