1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
# remove duplicated files when reading applypatch input
#
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'patch' program with this file as input.
#
#### End of Preamble ####
#### Patch data follows ####
diff -c 'diffstat-1.31/diffstat.c' 'diffstat-1.31_applypatch/diffstat.c'
Index: ./diffstat.c
Prereq: 1.31
*** ./diffstat.c Tue Aug 20 19:38:52 2002
--- ./diffstat.c Sat Nov 9 22:54:12 2002
***************
*** 483,489 ****
if (match(buffer, "Index: ")) {
s = strrchr(buffer, BLANK); /* last token is name */
blip('.');
! that = new_data(s + 1);
ok = begin_data(that);
}
break;
--- 483,491 ----
if (match(buffer, "Index: ")) {
s = strrchr(buffer, BLANK); /* last token is name */
blip('.');
! if (strlen(that->name) != 0)
! s = do_merging(that, s + 1);
! that = new_data(s);
ok = begin_data(that);
}
break;
***************
*** 493,499 ****
&& *(s = skip_options(buffer + 5)) != '\0') {
s = strrchr(buffer, BLANK);
blip('.');
! that = new_data(s + 1);
ok = begin_data(that);
}
break;
--- 495,503 ----
&& *(s = skip_options(buffer + 5)) != '\0') {
s = strrchr(buffer, BLANK);
blip('.');
! if (strlen(that->name) != 0)
! s = do_merging(that, s + 1);
! that = new_data(s);
ok = begin_data(that);
}
break;
#### End of Patch data ####
#### ApplyPatch data follows ####
# Data version : 1.0
# Date generated : Sat Nov 9 22:55:16 2002
# Generated by : makepatch 2.00_05
# Recurse directories : Yes
# p 'diffstat.c' 21017 1036900452 0100644
#### End of ApplyPatch data ####
#### End of Patch kit [created: Sat Nov 9 22:55:16 2002] ####
#### Patch checksum: 55 1528 36697 ####
#### Checksum: 73 2205 27936 ####
|
