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
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
|
/* $OpenBSD: rcsnum.c,v 1.59 2017/08/28 19:33:20 otto Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include "cvs.h"
#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b))
static void rcsnum_setsize(RCSNUM *, u_int);
static char *rcsnum_itoa(u_int16_t, char *, size_t);
/*
* rcsnum_alloc()
*
* Allocate an RCS number structure and return a pointer to it.
*/
RCSNUM *
rcsnum_alloc(void)
{
RCSNUM *rnp;
rnp = xcalloc(1, sizeof(*rnp));
rnp->rn_len = 0;
return (rnp);
}
/*
* rcsnum_addmagic()
*
* Adds a magic branch number to an RCS number.
* Returns 0 on success, or -1 on failure.
*/
int
rcsnum_addmagic(RCSNUM *rn)
{
if (!rn->rn_len || rn->rn_len > RCSNUM_MAXLEN - 1)
return -1;
rcsnum_setsize(rn, rn->rn_len + 1);
rn->rn_id[rn->rn_len - 1] = rn->rn_id[rn->rn_len - 2];
rn->rn_id[rn->rn_len - 2] = 0;
return 0;
}
/*
* rcsnum_parse()
*
* Parse a string specifying an RCS number and return the corresponding RCSNUM.
*/
RCSNUM *
rcsnum_parse(const char *str)
{
const char *ep;
RCSNUM *num;
num = rcsnum_alloc();
if (rcsnum_aton(str, &ep, num) < 0 || *ep != '\0') {
free(num);
num = NULL;
}
return (num);
}
/*
* rcsnum_tostr()
*
* Format the RCS number <nump> into a human-readable dot-separated
* representation and store the resulting string in <buf>, which is of size
* <blen>.
* Returns a pointer to the start of <buf>. On failure <buf> is set to
* an empty string.
*/
char *
rcsnum_tostr(const RCSNUM *nump, char *buf, size_t blen)
{
u_int i;
char tmp[8];
if (nump == NULL || nump->rn_len == 0) {
buf[0] = '\0';
return (buf);
}
if (strlcpy(buf, rcsnum_itoa(nump->rn_id[0], buf, blen), blen) >= blen)
fatal("rcsnum_tostr: truncation");
for (i = 1; i < nump->rn_len; i++) {
const char *str;
str = rcsnum_itoa(nump->rn_id[i], tmp, sizeof(tmp));
if (strlcat(buf, ".", blen) >= blen ||
strlcat(buf, str, blen) >= blen)
fatal("rcsnum_tostr: truncation");
}
return (buf);
}
static char *
rcsnum_itoa(u_int16_t num, char *buf, size_t len)
{
u_int16_t i;
char *p;
if (num == 0)
return "0";
p = buf + len - 1;
i = num;
bzero(buf, len);
while (i) {
*--p = '0' + (i % 10);
i /= 10;
}
return (p);
}
/*
* rcsnum_cpy()
*
* Copy the number stored in <nsrc> in the destination <ndst> up to <depth>
* numbers deep. If <depth> is 0, there is no depth limit.
*/
void
rcsnum_cpy(const RCSNUM *nsrc, RCSNUM *ndst, u_int depth)
{
u_int len;
len = nsrc->rn_len;
if (depth != 0 && len > depth)
len = depth;
rcsnum_setsize(ndst, len);
memcpy(ndst->rn_id, nsrc->rn_id, len * sizeof(*(nsrc->rn_id)));
}
/*
* rcsnum_cmp()
*
* Compare the two numbers <n1> and <n2>. Returns -1 if <n1> is larger than
* <n2>, 0 if they are both the same, and 1 if <n2> is larger than <n1>.
* The <depth> argument specifies how many numbers deep should be checked for
* the result. A value of 0 means that the depth will be the maximum of the
* two numbers, so that a longer number is considered greater than a shorter
* number if they are equal up to the minimum length.
*/
int
rcsnum_cmp(RCSNUM *n1, RCSNUM *n2, u_int depth)
{
int res;
u_int i;
size_t slen;
if (!rcsnum_differ(n1, n2))
return (0);
slen = MINIMUM(n1->rn_len, n2->rn_len);
if (depth != 0 && slen > depth)
slen = depth;
for (i = 0; i < slen; i++) {
res = n1->rn_id[i] - n2->rn_id[i];
if (res < 0)
return (1);
else if (res > 0)
return (-1);
}
/* If an explicit depth was specified, and we've
* already checked up to depth, consider the
* revision numbers equal. */
if (depth != 0 && slen == depth)
return (0);
else if (n1->rn_len > n2->rn_len)
return (-1);
else if (n2->rn_len > n1->rn_len)
return (1);
return (0);
}
/*
* rcsnum_aton()
*
* Translate the string <str> containing a sequence of digits and periods into
* its binary representation, which is stored in <nump>. The address of the
* first byte not part of the number is stored in <ep> on return, if it is not
* NULL.
* Returns 0 on success, or -1 on failure.
*/
int
rcsnum_aton(const char *str, const char **ep, RCSNUM *nump)
{
u_int32_t val;
const char *sp;
char *s;
nump->rn_len = 0;
nump->rn_id[0] = 0;
for (sp = str;; sp++) {
if (!isdigit((unsigned char)*sp) && (*sp != '.'))
break;
if (*sp == '.') {
if (nump->rn_len >= RCSNUM_MAXLEN - 1)
goto rcsnum_aton_failed;
nump->rn_len++;
nump->rn_id[nump->rn_len] = 0;
continue;
}
val = (nump->rn_id[nump->rn_len] * 10) + (*sp - '0');
if (val > RCSNUM_MAXNUM)
fatal("RCSNUM overflow!");
nump->rn_id[nump->rn_len] = val;
}
if (ep != NULL)
*ep = sp;
/*
* Handle "magic" RCS branch numbers.
*
* What are they?
*
* Magic branch numbers have an extra .0. at the second farmost
* rightside of the branch number, so instead of having an odd
* number of dot-separated decimals, it will have an even number.
*
* Now, according to all the documentation I've found on the net
* about this, cvs does this for "efficiency reasons", I'd like
* to hear one.
*
* We just make sure we remove the .0. from in the branch number.
*
* XXX - for compatibility reasons with GNU cvs we _need_
* to skip this part for the 'log' command, apparently it does
* show the magic branches for an unknown and probably
* completely insane and not understandable reason in that output.
*
*/
if (nump->rn_len > 2 && nump->rn_id[nump->rn_len - 1] == 0) {
/*
* Look for ".0.x" at the end of the branch number.
*/
if ((s = strrchr(str, '.')) != NULL) {
s--;
while (*s != '.')
s--;
/*
* If we have a "magic" branch, adjust it
* so the .0. is removed.
*/
if (!strncmp(s, RCS_MAGIC_BRANCH,
sizeof(RCS_MAGIC_BRANCH) - 1)) {
nump->rn_id[nump->rn_len - 1] =
nump->rn_id[nump->rn_len];
nump->rn_len--;
}
}
}
/* We can't have a single-digit rcs number. */
if (nump->rn_len == 0) {
nump->rn_len++;
nump->rn_id[nump->rn_len] = 0;
}
nump->rn_len++;
return (nump->rn_len);
rcsnum_aton_failed:
nump->rn_len = 0;
return (-1);
}
/*
* rcsnum_inc()
*
* Increment the revision number specified in <num>.
* Returns a pointer to the <num> on success, or NULL on failure.
*/
RCSNUM *
rcsnum_inc(RCSNUM *num)
{
if (num->rn_id[num->rn_len - 1] == RCSNUM_MAXNUM)
return (NULL);
num->rn_id[num->rn_len - 1]++;
return (num);
}
/*
* rcsnum_dec()
*
* Decreases the revision number specified in <num>, if doing so will not
* result in an ending value below 1. E.g. 4.2 will go to 4.1 but 4.1 will
* be returned as 4.1.
*/
RCSNUM *
rcsnum_dec(RCSNUM *num)
{
/* XXX - Is it an error for the number to be 0? */
if (num->rn_id[num->rn_len - 1] <= 1)
return (num);
num->rn_id[num->rn_len - 1]--;
return (num);
}
/*
* rcsnum_revtobr()
*
* Retrieve the branch number associated with the revision number <num>.
* If <num> is a branch revision, the returned value will be the same
* number as the argument.
*/
RCSNUM *
rcsnum_revtobr(const RCSNUM *num)
{
RCSNUM *brnum;
if (num->rn_len < 2)
return (NULL);
brnum = rcsnum_alloc();
rcsnum_cpy(num, brnum, 0);
if (!RCSNUM_ISBRANCH(brnum))
brnum->rn_len--;
return (brnum);
}
/*
* rcsnum_brtorev()
*
* Retrieve the initial revision number associated with the branch number <num>.
* If <num> is a revision number, an error will be returned.
*/
RCSNUM *
rcsnum_brtorev(const RCSNUM *brnum)
{
RCSNUM *num;
if (!RCSNUM_ISBRANCH(brnum)) {
return (NULL);
}
num = rcsnum_alloc();
rcsnum_setsize(num, brnum->rn_len + 1);
rcsnum_cpy(brnum, num, brnum->rn_len);
num->rn_id[num->rn_len++] = 1;
return (num);
}
RCSNUM *
rcsnum_new_branch(RCSNUM *rev)
{
RCSNUM *branch;
if (rev->rn_len > RCSNUM_MAXLEN - 1)
return NULL;
branch = rcsnum_alloc();
rcsnum_cpy(rev, branch, 0);
rcsnum_setsize(branch, rev->rn_len + 1);
branch->rn_id[branch->rn_len - 1] = 2;
return branch;
}
RCSNUM *
rcsnum_branch_root(RCSNUM *brev)
{
RCSNUM *root;
if (!RCSNUM_ISBRANCHREV(brev))
fatal("rcsnum_branch_root: no revision on branch specified");
root = rcsnum_alloc();
rcsnum_cpy(brev, root, 0);
root->rn_len -= 2;
return (root);
}
static void
rcsnum_setsize(RCSNUM *num, u_int len)
{
num->rn_len = len;
}
int
rcsnum_differ(RCSNUM *r1, RCSNUM *r2)
{
int i, len;
if (r1->rn_len != r2->rn_len)
return (1);
len = MINIMUM(r1->rn_len, r2->rn_len);
for (i = 0; i < len; i++) {
if (r1->rn_id[i] != r2->rn_id[i])
return (1);
}
return (0);
}
|