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
|
--- src/refresh.c.orig Mon Aug 23 19:40:08 2004
+++ src/refresh.c Thu Nov 24 15:11:48 2005
@@ -62,8 +62,14 @@
__RCSID("$Id: refresh.c,v 1.32 2004/08/24 02:40:08 sethk Exp $");
/* XXX use libinstall/lib.h */
+#if __FreeBSD_version >= 600000
+#define INDEX_FN PORTS_BASE "/INDEX-6"
+#elif __FreeBSD_version >= 500036
+#define INDEX_FN PORTS_BASE "/INDEX-5"
+#else
#define INDEX_FN PORTS_BASE "/INDEX"
-#define INDEX_MAXLN 4096
+#endif
+#define INDEX_MAXLN 8192
#define DB_DIR "/var/db/pkg"
#define ITER_BYTES (128 * 1024)
#define ITER_ENTS 32
@@ -183,10 +189,12 @@
if (*sp == '|')
++i;
- if (i != (PFIELD_NFIELD - 1))
+ if (i < (PFIELD_NFIELD - 1))
{
#ifdef DEBUG
- warnx("invalid number of fields");
+ warnx("invalid number of fields (%d should be %d)",
+ i + 1,
+ PFIELD_NFIELD);
#endif /* DEBUG */
return FALSE;
}
@@ -195,12 +203,9 @@
for (i = 0; i < PFIELD_NFIELD; ++i)
{
- if (i < PFIELD_NFIELD - 1)
- {
- if (!(sp = strchr(line, '|')))
- break;
- *sp++ = '\0';
- }
+ if (!(sp = strchr(line, '|')) && i < PFIELD_NFIELD - 1)
+ break;
+ *sp++ = '\0';
switch (i)
{
@@ -320,7 +325,6 @@
if (_refresh_index_parse(ln, portdp, rdp) != TRUE)
{
- _refresh_portfree(portdp);
#ifdef DEBUG
warnx("%s:%u: invalid format", INDEX_FN, rdp->rd_linec);
#endif /* DEBUG */
|
