Contents of /trunk/rcs/patches/rcs-5.7-debian-25.patch
Parent Directory | Revision Log
Revision 1011 -
(show annotations)
(download)
Sun Mar 7 19:13:54 2010 UTC (14 years, 6 months ago) by niro
File size: 16561 byte(s)
Sun Mar 7 19:13:54 2010 UTC (14 years, 6 months ago) by niro
File size: 16561 byte(s)
-fixed patch
1 | diff -Naur rcs-5.7/configure.in rcs-5.7-magellan/configure.in |
2 | --- rcs-5.7/configure.in 1995-06-16 08:19:24.000000000 +0200 |
3 | +++ rcs-5.7-magellan/configure.in 2010-03-07 20:13:14.000000000 +0100 |
4 | @@ -243,7 +243,7 @@ |
5 | AC_PATH_PROG(ED, ed, ed) |
6 | |
7 | ac_save_path=$PATH |
8 | -PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH |
9 | +PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH |
10 | AC_PATH_PROGS(SENDMAIL, sendmail mail mailx) |
11 | PATH=$ac_save_path |
12 | case $SENDMAIL in |
13 | diff -Naur rcs-5.7/Makefile.in rcs-5.7-magellan/Makefile.in |
14 | --- rcs-5.7/Makefile.in 1995-06-16 08:19:24.000000000 +0200 |
15 | +++ rcs-5.7-magellan/Makefile.in 2010-03-07 20:12:56.000000000 +0100 |
16 | @@ -43,6 +43,7 @@ |
17 | @echo "it deletes files that may require special tools to rebuild." |
18 | |
19 | $(standard_GNU_targets) installcheck installdebug :: |
20 | + groff -t -p -Tps -ms rcs.ms >rcs.ps |
21 | cd man && $(MAKE) $@ |
22 | cd src && $(MAKE) $@ |
23 | |
24 | @@ -77,7 +78,7 @@ |
25 | |
26 | clean :: clean. |
27 | clean. :: |
28 | - rm -f confdefs* conftest* core core.* *.core |
29 | + rm -f confdefs* conftest* core core.* *.core *.ps |
30 | |
31 | distclean maintainer-clean :: distclean. |
32 | distclean. :: clean. |
33 | diff -Naur rcs-5.7/man/co.1 rcs-5.7-magellan/man/co.1 |
34 | --- rcs-5.7/man/co.1 1995-06-01 18:23:43.000000000 +0200 |
35 | +++ rcs-5.7-magellan/man/co.1 2010-03-07 20:13:04.000000000 +0100 |
36 | @@ -597,7 +597,7 @@ |
37 | .RB \*(lq "//\ " \*(rq. |
38 | This is useful for languages with comments that go to the end of the line. |
39 | The convention for other languages is to use a |
40 | -.RB \*(lq " \(** " \(rq |
41 | +.RB \*(lq " * " \(rq |
42 | prefix inside a multiline comment. |
43 | For example, the initial log comment of a C program |
44 | conventionally is of the following form: |
45 | @@ -606,19 +606,19 @@ |
46 | .nf |
47 | .ft 3 |
48 | .ne 3 |
49 | -/\(** |
50 | +/* |
51 | .in +\w'/'u |
52 | -\(** $\&Log$ |
53 | -\(**/ |
54 | +* $\&Log$ |
55 | +*/ |
56 | .in |
57 | .ft |
58 | .fi |
59 | .RE |
60 | .LP |
61 | For backwards compatibility with older versions of \*r, if the log prefix is |
62 | -.B /\(** |
63 | +.B /* |
64 | or |
65 | -.B (\(** |
66 | +.B (* |
67 | surrounded by optional white space, inserted log lines contain a space |
68 | instead of |
69 | .B / |
70 | diff -Naur rcs-5.7/man/Makefile.in rcs-5.7-magellan/man/Makefile.in |
71 | --- rcs-5.7/man/Makefile.in 1995-06-16 08:19:24.000000000 +0200 |
72 | +++ rcs-5.7-magellan/man/Makefile.in 2010-03-07 20:13:14.000000000 +0100 |
73 | @@ -34,8 +34,8 @@ |
74 | PIC = @PIC@ |
75 | |
76 | prefix = @prefix@ |
77 | -man1dir = $(prefix)/man/man1 |
78 | -man5dir = $(prefix)/man/man5 |
79 | +man1dir = $(prefix)/share/man/man1 |
80 | +man5dir = $(prefix)/share/man/man5 |
81 | man1ext = .1 |
82 | man5ext = .5 |
83 | |
84 | @@ -51,7 +51,8 @@ |
85 | installdirs :: ../mkinstalldirs |
86 | -$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir) |
87 | |
88 | -man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog |
89 | +man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog \ |
90 | + rcsfreeze |
91 | |
92 | install :: installdirs |
93 | -for m in $(man1pages); do \ |
94 | diff -Naur rcs-5.7/man/merge.1 rcs-5.7-magellan/man/merge.1 |
95 | --- rcs-5.7/man/merge.1 1995-06-01 18:23:43.000000000 +0200 |
96 | +++ rcs-5.7-magellan/man/merge.1 2010-03-07 20:13:04.000000000 +0100 |
97 | @@ -114,8 +114,9 @@ |
98 | .TP |
99 | .BI \-q |
100 | Quiet; do not warn about conflicts. |
101 | +.TP |
102 | .BI \-V |
103 | -Print \*r's version number. |
104 | +Print version number. |
105 | .SH DIAGNOSTICS |
106 | Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble. |
107 | .SH IDENTIFICATION |
108 | @@ -127,7 +128,10 @@ |
109 | .br |
110 | Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert. |
111 | .SH SEE ALSO |
112 | -diff3(1), diff(1), rcsmerge(1), co(1). |
113 | +.BR diff3 (1), |
114 | +.BR diff (1), |
115 | +.BR rcsmerge (1), |
116 | +.BR co(1) . |
117 | .SH BUGS |
118 | It normally does not make sense to merge binary files as if they were text, but |
119 | .B merge |
120 | diff -Naur rcs-5.7/man/rcsfile.5 rcs-5.7-magellan/man/rcsfile.5 |
121 | --- rcs-5.7/man/rcsfile.5 1995-06-16 08:58:26.000000000 +0200 |
122 | +++ rcs-5.7-magellan/man/rcsfile.5 2010-03-07 20:13:06.000000000 +0100 |
123 | @@ -69,6 +69,7 @@ |
124 | \f3state\fP {\f2id\fP}\f3;\fP |
125 | \f3branches\fP {\f2num\fP}*\f3;\fP |
126 | \f3next\fP {\f2num\fP}\f3;\fP |
127 | + { \f3commitid\fP \f2id\fP\f3;\fP } |
128 | { \f2newphrase\fP }* |
129 | .LP |
130 | \f2desc\fP ::= \f3desc\fP \f2string\fP |
131 | @@ -128,6 +129,18 @@ |
132 | Dates use the Gregorian calendar; times use UTC. |
133 | .PP |
134 | The |
135 | +.I commitid |
136 | +is followed by an |
137 | +.I id |
138 | +token. This token is intended to be unique across |
139 | +multiple files and is used to help group files as |
140 | +being a part of the same logical commit. |
141 | +This token must uniquely identify the commit |
142 | +operation that was applied to a set of RCS files. |
143 | +In particular, it must be unique among all the |
144 | +commitids in this file. |
145 | +.PP |
146 | +The |
147 | .I newphrase |
148 | productions in the grammar are reserved for future extensions |
149 | to the format of \*r files. |
150 | @@ -230,7 +243,7 @@ |
151 | .fi |
152 | .\} |
153 | .if \np \{\ |
154 | -.lf 232 |
155 | +.lf 245 |
156 | .PS 4.250i 3.812i |
157 | .\" -2.0625 -4.25 1.75 0 |
158 | .\" 0.000i 4.250i 3.812i 0.000i |
159 | @@ -239,7 +252,7 @@ |
160 | .nr 0x 1 |
161 | \h'3.812i' |
162 | .sp -1 |
163 | -.lf 242 |
164 | +.lf 255 |
165 | \h'2.062i-(\w'Head'u/2u)'\v'0.125i-(0v/2u)+0v+0.22m'Head |
166 | .sp -1 |
167 | \h'2.062i'\v'0.250i'\D'l0.000i 0.500i' |
168 | @@ -256,7 +269,7 @@ |
169 | .sp -1 |
170 | \h'1.688i'\v'0.750i'\D'l0.000i 0.500i' |
171 | .sp -1 |
172 | -.lf 244 |
173 | +.lf 257 |
174 | \h'2.062i-(\w'2.1'u/2u)'\v'1.000i-(0v/2u)+0v+0.22m'2.1 |
175 | .sp -1 |
176 | \h'2.062i'\v'1.250i'\D'l0.000i 0.500i' |
177 | @@ -265,7 +278,7 @@ |
178 | .sp -1 |
179 | \h'2.062i'\v'1.750i'\D'l-0.025i -0.100i' |
180 | .sp -1 |
181 | -.lf 246 |
182 | +.lf 259 |
183 | \h'2.062i-(\w'1.3'u/2u)'\v'2.000i-(1v/2u)+0v+0.22m'1.3 |
184 | .sp -1 |
185 | \h'2.062i'\v'2.250i'\D'l-0.375i -0.500i' |
186 | @@ -280,7 +293,7 @@ |
187 | .sp -1 |
188 | \h'1.375i'\v'1.500i'\D'l0.025i 0.100i' |
189 | .sp -1 |
190 | -.lf 249 |
191 | +.lf 262 |
192 | \h'1.375i-(\w'1.3.1.1'u/2u)'\v'1.250i-(1v/2u)+1v+0.22m'1.3.1.1 |
193 | .sp -1 |
194 | \h'1.375i'\v'1.000i'\D'l-0.375i 0.500i' |
195 | @@ -295,7 +308,7 @@ |
196 | .sp -1 |
197 | \h'2.062i'\v'2.750i'\D'l-0.025i -0.100i' |
198 | .sp -1 |
199 | -.lf 252 |
200 | +.lf 265 |
201 | \h'2.062i-(\w'1.2'u/2u)'\v'3.000i-(1v/2u)+0v+0.22m'1.2 |
202 | .sp -1 |
203 | \h'2.062i'\v'3.250i'\D'l-0.375i -0.500i' |
204 | @@ -310,7 +323,7 @@ |
205 | .sp -1 |
206 | \h'0.375i'\v'2.500i'\D'l0.025i 0.100i' |
207 | .sp -1 |
208 | -.lf 255 |
209 | +.lf 268 |
210 | \h'0.375i-(\w'1.2.1.1'u/2u)'\v'2.250i-(1v/2u)+1v+0.22m'1.2.1.1 |
211 | .sp -1 |
212 | \h'0.375i'\v'2.000i'\D'l-0.375i 0.500i' |
213 | @@ -325,7 +338,7 @@ |
214 | .sp -1 |
215 | \h'0.375i'\v'1.500i'\D'l0.025i 0.100i' |
216 | .sp -1 |
217 | -.lf 257 |
218 | +.lf 270 |
219 | \h'0.375i-(\w'1.2.1.3'u/2u)'\v'1.250i-(1v/2u)+1v+0.22m'1.2.1.3 |
220 | .sp -1 |
221 | \h'0.375i'\v'1.000i'\D'l-0.375i 0.500i' |
222 | @@ -340,7 +353,7 @@ |
223 | .sp -1 |
224 | \h'2.750i'\v'2.500i'\D'l0.025i 0.100i' |
225 | .sp -1 |
226 | -.lf 261 |
227 | +.lf 274 |
228 | \h'2.750i-(\w'1.2.2.1'u/2u)'\v'2.250i-(1v/2u)+1v+0.22m'1.2.2.1 |
229 | .sp -1 |
230 | \h'2.750i'\v'2.000i'\D'l-0.375i 0.500i' |
231 | @@ -355,7 +368,7 @@ |
232 | .sp -1 |
233 | \h'3.438i'\v'1.250i'\D'l0.025i 0.100i' |
234 | .sp -1 |
235 | -.lf 264 |
236 | +.lf 277 |
237 | \h'3.438i-(\w'\s-21.2.2.1.1.1\s0'u/2u)'\v'1.000i-(1v/2u)+1v+0.22m'\s-21.2.2.1.1.1\s0 |
238 | .sp -1 |
239 | \h'3.438i'\v'0.750i'\D'l-0.375i 0.500i' |
240 | @@ -370,7 +383,7 @@ |
241 | .sp -1 |
242 | \h'2.750i'\v'1.500i'\D'l0.025i 0.100i' |
243 | .sp -1 |
244 | -.lf 267 |
245 | +.lf 280 |
246 | \h'2.750i-(\w'1.2.2.2'u/2u)'\v'1.250i-(1v/2u)+1v+0.22m'1.2.2.2 |
247 | .sp -1 |
248 | \h'2.750i'\v'1.000i'\D'l-0.375i 0.500i' |
249 | @@ -385,7 +398,7 @@ |
250 | .sp -1 |
251 | \h'2.062i'\v'3.750i'\D'l-0.025i -0.100i' |
252 | .sp -1 |
253 | -.lf 270 |
254 | +.lf 283 |
255 | \h'2.062i-(\w'1.1'u/2u)'\v'4.000i-(1v/2u)+0v+0.22m'1.1 |
256 | .sp -1 |
257 | \h'2.062i'\v'4.250i'\D'l-0.375i -0.500i' |
258 | @@ -398,9 +411,9 @@ |
259 | .if \n(00 .fi |
260 | .br |
261 | .nr 0x 0 |
262 | -.lf 271 |
263 | +.lf 284 |
264 | .PE |
265 | -.lf 272 |
266 | +.lf 285 |
267 | .\} |
268 | .PP |
269 | .SH IDENTIFICATION |
270 | diff -Naur rcs-5.7/man/rcsfile.5in rcs-5.7-magellan/man/rcsfile.5in |
271 | --- rcs-5.7/man/rcsfile.5in 1995-06-05 10:28:35.000000000 +0200 |
272 | +++ rcs-5.7-magellan/man/rcsfile.5in 2010-03-07 20:13:06.000000000 +0100 |
273 | @@ -68,6 +68,7 @@ |
274 | \f3state\fP {\f2id\fP}\f3;\fP |
275 | \f3branches\fP {\f2num\fP}*\f3;\fP |
276 | \f3next\fP {\f2num\fP}\f3;\fP |
277 | + { \f3commitid\fP \f2id\fP\f3;\fP } |
278 | { \f2newphrase\fP }* |
279 | .LP |
280 | \f2desc\fP ::= \f3desc\fP \f2string\fP |
281 | @@ -127,6 +128,18 @@ |
282 | Dates use the Gregorian calendar; times use UTC. |
283 | .PP |
284 | The |
285 | +.I commitid |
286 | +is followed by an |
287 | +.I id |
288 | +token. This token is intended to be unique across |
289 | +multiple files and is used to help group files as |
290 | +being a part of the same logical commit. |
291 | +This token must uniquely identify the commit |
292 | +operation that was applied to a set of RCS files. |
293 | +In particular, it must be unique among all the |
294 | +commitids in this file. |
295 | +.PP |
296 | +The |
297 | .I newphrase |
298 | productions in the grammar are reserved for future extensions |
299 | to the format of \*r files. |
300 | diff -Naur rcs-5.7/man/rlog.1 rcs-5.7-magellan/man/rlog.1 |
301 | --- rcs-5.7/man/rlog.1 1995-06-16 08:19:24.000000000 +0200 |
302 | +++ rcs-5.7-magellan/man/rlog.1 2010-03-07 20:13:04.000000000 +0100 |
303 | @@ -187,6 +187,10 @@ |
304 | .I logins |
305 | is omitted, the user's login is assumed. |
306 | .TP |
307 | +.B \-q |
308 | +This option has no effect; |
309 | +it is provided for consistency with other commands. |
310 | +.TP |
311 | .B \-T |
312 | This option has no effect; |
313 | it is present for compatibility with other \*r commands. |
314 | diff -Naur rcs-5.7/src/conf.sh rcs-5.7-magellan/src/conf.sh |
315 | --- rcs-5.7/src/conf.sh 1995-06-16 08:19:24.000000000 +0200 |
316 | +++ rcs-5.7-magellan/src/conf.sh 2010-03-07 20:13:14.000000000 +0100 |
317 | @@ -73,17 +73,6 @@ |
318 | ech='echo -n' dots='... ' |
319 | esac |
320 | |
321 | -$ech >&3 "$0: testing permissions $dots" |
322 | -rm -f a.d && |
323 | -date >a.d && |
324 | -chmod 0 a.d && |
325 | -{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && { |
326 | - echo >&3 "$n$0: This command should not be run with superuser permissions." |
327 | - exit 1 |
328 | -} |
329 | -echo >&3 OK |
330 | -rm -f a.d || exit |
331 | - |
332 | $ech >&3 "$0: testing compiler for plausibility $dots" |
333 | echo 'main() { return 0; }' >a.c |
334 | rm -f a.exe a.out || exit |
335 | diff -Naur rcs-5.7/src/ident.c rcs-5.7-magellan/src/ident.c |
336 | --- rcs-5.7/src/ident.c 1995-06-16 08:19:24.000000000 +0200 |
337 | +++ rcs-5.7-magellan/src/ident.c 2010-03-07 20:13:11.000000000 +0100 |
338 | @@ -234,7 +234,7 @@ |
339 | if (c == EOF && feof(fp) | ferror(fp)) |
340 | return c; |
341 | switch (ctab[c]) { |
342 | - case LETTER: case Letter: |
343 | + case LETTER: case Letter: case DIGIT: |
344 | *tp++ = c; |
345 | if (tp < line+sizeof(line)-4) |
346 | break; |
347 | diff -Naur rcs-5.7/src/Makefile.in rcs-5.7-magellan/src/Makefile.in |
348 | --- rcs-5.7/src/Makefile.in 1995-06-16 08:19:24.000000000 +0200 |
349 | +++ rcs-5.7-magellan/src/Makefile.in 2010-03-07 20:13:14.000000000 +0100 |
350 | @@ -116,16 +116,18 @@ |
351 | for p in $(PROGRAMS); do \ |
352 | $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \ |
353 | done |
354 | + $(INSTALL_PROGRAM) rcsfreeze.sh $(bindir)/rcsfreeze |
355 | |
356 | uninstall :: |
357 | for p in $(PROGRAMS); do \ |
358 | $(REMOVE) $(bindir)/$$p; \ |
359 | done |
360 | + $(REMOVE) $(bindir)/rcsfreeze |
361 | |
362 | # Install RCS and (if applicable) GNU diff before running these tests. |
363 | # To test RCS before installing it, see the file INSTALL.RCS. |
364 | RCSTEST = \ |
365 | - ALL_CFLAGS='$(ALL_CFLAGS)' CC='$(CC)' DIFF='$(DIFF)' \ |
366 | + ALL_CFLAGS="$(ALL_CFLAGS)" CC='$(CC)' DIFF='$(DIFF)' \ |
367 | LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \ |
368 | PATH=$(bindir):$$PATH \ |
369 | sh $(srcdir)/rcstest |
370 | @@ -153,7 +155,7 @@ |
371 | #(Unix |
372 | conf.h : conf.sh Makefile |
373 | $(REMOVE) a.* |
374 | - ALL_CFLAGS='$(ALL_CFLAGS)' \ |
375 | + ALL_CFLAGS="$(ALL_CFLAGS)" \ |
376 | CC='$(CC)' \ |
377 | COMPAT2='$(COMPAT2)' \ |
378 | DIFF3='$(DIFF3)' DIFF3_BIN='$(DIFF3_BIN)' \ |
379 | diff -Naur rcs-5.7/src/rcsbase.h rcs-5.7-magellan/src/rcsbase.h |
380 | --- rcs-5.7/src/rcsbase.h 1995-06-16 08:19:24.000000000 +0200 |
381 | +++ rcs-5.7-magellan/src/rcsbase.h 2010-03-07 20:13:06.000000000 +0100 |
382 | @@ -358,6 +358,7 @@ |
383 | char const * lockedby; /* who locks the revision */ |
384 | char const * state; /* state of revision (Exp by default) */ |
385 | char const * name; /* name (if any) by which retrieved */ |
386 | + char const * commitid; /* text string to associate commits */ |
387 | struct cbuf log; /* log message requested at checkin */ |
388 | struct branchhead * branches; /* list of first revisions on branches*/ |
389 | struct cbuf ig; /* ignored phrases in admin part */ |
390 | @@ -662,6 +663,7 @@ |
391 | extern char const *const expand_names[]; |
392 | extern char const |
393 | Kaccess[], Kauthor[], Kbranch[], Kcomment[], |
394 | + Kcommitid[], |
395 | Kdate[], Kdesc[], Kexpand[], Khead[], Klocks[], Klog[], |
396 | Knext[], Kstate[], Kstrict[], Ksymbols[], Ktext[]; |
397 | void unexpected_EOF P((void)) exiting; |
398 | diff -Naur rcs-5.7/src/rcs.c rcs-5.7-magellan/src/rcs.c |
399 | --- rcs-5.7/src/rcs.c 1995-06-16 08:19:24.000000000 +0200 |
400 | +++ rcs-5.7-magellan/src/rcs.c 2010-03-07 20:13:13.000000000 +0100 |
401 | @@ -916,10 +916,11 @@ |
402 | getkeystring(Klog); |
403 | if (nextdelta == cuttail) { |
404 | cb = savestring(&curlogbuf); |
405 | - if (!delta->log.string) |
406 | + if (delta && !delta->log.string) |
407 | delta->log = cleanlogmsg(curlogbuf.string, cb.size); |
408 | nextlex(); |
409 | - delta->igtext = getphrases(Ktext); |
410 | + if (delta) |
411 | + delta->igtext = getphrases(Ktext); |
412 | } else { |
413 | if (nextdelta->log.string && nextdelta->selector) { |
414 | foutptr = 0; |
415 | diff -Naur rcs-5.7/src/rcsdiff.c rcs-5.7-magellan/src/rcsdiff.c |
416 | --- rcs-5.7/src/rcsdiff.c 1995-06-16 08:19:24.000000000 +0200 |
417 | +++ rcs-5.7-magellan/src/rcsdiff.c 2010-03-07 20:13:10.000000000 +0100 |
418 | @@ -212,9 +212,13 @@ |
419 | } |
420 | goto option_handled; |
421 | case '-': case 'D': |
422 | - no_diff_means_no_output = false; |
423 | + if (c == 'D' |
424 | + || strcmp(*argv, "--side-by-side") == 0 |
425 | + || strcmp(*argv, "--ifdef") == 0) { |
426 | + no_diff_means_no_output = false; |
427 | + } |
428 | /* fall into */ |
429 | - case 'C': case 'F': case 'I': case 'L': case 'W': |
430 | + case 'C': case 'F': case 'I': case 'L': case 'U': case 'W': |
431 | #if DIFF_L |
432 | if (c == 'L' && ++file_labels == 2) |
433 | faterror("too many -L options"); |
434 | diff -Naur rcs-5.7/src/rcsedit.c rcs-5.7-magellan/src/rcsedit.c |
435 | --- rcs-5.7/src/rcsedit.c 1995-06-16 08:19:24.000000000 +0200 |
436 | +++ rcs-5.7-magellan/src/rcsedit.c 2010-03-07 20:13:08.000000000 +0100 |
437 | @@ -1503,6 +1503,9 @@ |
438 | register size_t dl; |
439 | register struct buf *bn; |
440 | register char const *name = isworkfile ? workname : RCSname; |
441 | +# if has_mktemp |
442 | + int fd; |
443 | +# endif |
444 | |
445 | dl = basefilename(name) - name; |
446 | bn = &dirtpname[newRCSdirtp_index + isworkfile]; |
447 | @@ -1521,10 +1524,12 @@ |
448 | catchints(); |
449 | # if has_mktemp |
450 | VOID strcpy(tp, "XXXXXX"); |
451 | - if (!mktemp(np) || !*np) |
452 | + fd = mkstemp(np); |
453 | + if (fd < 0 || !*np) |
454 | faterror("can't make temporary pathname `%.*s_%cXXXXXX'", |
455 | (int)dl, name, '0'+isworkfile |
456 | ); |
457 | + close(fd); |
458 | # else |
459 | /* |
460 | * Posix 1003.1-1990 has no reliable way |
461 | diff -Naur rcs-5.7/src/rcsfnms.c rcs-5.7-magellan/src/rcsfnms.c |
462 | --- rcs-5.7/src/rcsfnms.c 1995-06-16 08:19:24.000000000 +0200 |
463 | +++ rcs-5.7-magellan/src/rcsfnms.c 2010-03-07 20:13:08.000000000 +0100 |
464 | @@ -285,6 +285,9 @@ |
465 | { |
466 | char *p; |
467 | char const *t = tpnames[n]; |
468 | +# if has_mktemp |
469 | + int fd; |
470 | +# endif |
471 | |
472 | if (t) |
473 | return t; |
474 | @@ -296,10 +299,12 @@ |
475 | size_t tplen = dir_useful_len(tp); |
476 | p = testalloc(tplen + 10); |
477 | VOID sprintf(p, "%.*s%cT%cXXXXXX", (int)tplen, tp, SLASH, '0'+n); |
478 | - if (!mktemp(p) || !*p) |
479 | + fd = mkstemp(p); |
480 | + if (fd < 0 || !*p) |
481 | faterror("can't make temporary pathname `%.*s%cT%cXXXXXX'", |
482 | (int)tplen, tp, SLASH, '0'+n |
483 | ); |
484 | + close(fd); |
485 | # else |
486 | static char tpnamebuf[TEMPNAMES][L_tmpnam]; |
487 | p = tpnamebuf[n]; |
488 | diff -Naur rcs-5.7/src/rcsfreeze.sh rcs-5.7-magellan/src/rcsfreeze.sh |
489 | --- rcs-5.7/src/rcsfreeze.sh 1993-11-03 18:42:27.000000000 +0100 |
490 | +++ rcs-5.7-magellan/src/rcsfreeze.sh 2010-03-07 20:13:08.000000000 +0100 |
491 | @@ -59,8 +59,7 @@ |
492 | |
493 | # Stamp the logfile. Because we order the logfile the most recent |
494 | # first we will have to save everything right now in a temporary file. |
495 | -TMPLOG=/tmp/rcsfrz$$ |
496 | -trap 'rm -f $TMPLOG; exit 1' 1 2 13 15 |
497 | +TMPLOG=$(tempfile) |
498 | # Now ask for a log message, continously add to the log file |
499 | ( |
500 | echo "Version: $SYMREVNAME($SYMREV), Date: $DATE |
501 | diff -Naur rcs-5.7/src/rcsgen.c rcs-5.7-magellan/src/rcsgen.c |
502 | --- rcs-5.7/src/rcsgen.c 1995-06-16 08:19:24.000000000 +0200 |
503 | +++ rcs-5.7-magellan/src/rcsgen.c 2010-03-07 20:13:06.000000000 +0100 |
504 | @@ -547,6 +547,9 @@ |
505 | |
506 | aprintf(fout, ";\n%s\t%s;\n", Knext, node->next?node->next->num:""); |
507 | awrite(node->ig.string, node->ig.size, fout); |
508 | + |
509 | + if (node->commitid) |
510 | + aprintf(fout, "%s\t%s;\n", Kcommitid, node->commitid); |
511 | } |
512 | |
513 | |
514 | diff -Naur rcs-5.7/src/rcssyn.c rcs-5.7-magellan/src/rcssyn.c |
515 | --- rcs-5.7/src/rcssyn.c 1995-06-16 08:19:24.000000000 +0200 |
516 | +++ rcs-5.7-magellan/src/rcssyn.c 2010-03-07 20:13:06.000000000 +0100 |
517 | @@ -171,6 +171,7 @@ |
518 | Kauthor[] = "author", |
519 | Kbranch[] = "branch", |
520 | Kcomment[] = "comment", |
521 | + Kcommitid[] = "commitid", |
522 | Kdate[] = "date", |
523 | Kdesc[] = "desc", |
524 | Kexpand[] = "expand", |
525 | @@ -433,6 +434,14 @@ |
526 | Delta->lockedby = 0; |
527 | Delta->log.string = 0; |
528 | Delta->selector = true; |
529 | + |
530 | + if (getkeyopt(Kcommitid)) { |
531 | + Delta->commitid = NextString; |
532 | + nextlex(); |
533 | + getsemi(Kcommitid); |
534 | + } else |
535 | + Delta->commitid = NULL; |
536 | + |
537 | Delta->ig = getphrases(Kdesc); |
538 | TotalDeltas++; |
539 | return (true); |
540 | diff -Naur rcs-5.7/src/rlog.c rcs-5.7-magellan/src/rlog.c |
541 | --- rcs-5.7/src/rlog.c 1995-06-16 08:19:24.000000000 +0200 |
542 | +++ rcs-5.7-magellan/src/rlog.c 2010-03-07 20:13:06.000000000 +0100 |
543 | @@ -591,6 +591,10 @@ |
544 | aprintf(out, insDelFormat, |
545 | editscript->insertlns, editscript->deletelns); |
546 | |
547 | + if ( node->commitid ) |
548 | + aprintf(out, "%s commitid: %s", (editscript) ? ";" : "", |
549 | + node->commitid); |
550 | + |
551 | newbranch = node->branches; |
552 | if ( newbranch ) { |
553 | bufautobegin(&branchnum); |