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
|
--- a/archival/libipkg/pkg.c
+++ b/archival/libipkg/pkg.c
@@ -224,8 +224,7 @@
if (err) { return err; }
rewind(control_file);
- raw = read_raw_pkgs_from_stream(control_file);
- pkg_parse_raw(pkg, &raw, NULL, NULL);
+ pkg_parse_stream(pkg, control_file, NULL, NULL);
fclose(control_file);
--- a/archival/libipkg/pkg_hash.c
+++ b/archival/libipkg/pkg_hash.c
@@ -89,20 +89,20 @@
pkg_src_t *src, pkg_dest_t *dest, int is_status_file)
{
hash_table_t *hash = &conf->pkg_hash;
- char **raw;
- char **raw_start;
+ FILE *fp;
pkg_t *pkg;
- raw = raw_start = read_raw_pkgs_from_file(file_name);
- if (!raw)
- return -ENOMEM;
+ if(!(fp = fopen(file_name, "r"))){
+ fprintf(stderr, "can't get %s open for read\n", file_name);
+ return NULL;
+ }
- while(*raw){ /* don't worry, we'll increment raw in the parsing function */
+ while(!feof(fp)) { /* don't worry, we'll increment raw in the parsing function */
pkg = pkg_new();
if (!pkg)
return -ENOMEM;
- if (pkg_parse_raw(pkg, &raw, src, dest) == 0) {
+ if (pkg_parse_stream(pkg, fp, src, dest) == 0) {
if (!pkg->architecture) {
char *version_str = pkg_version_str_alloc(pkg);
pkg->architecture = pkg_get_default_arch(conf);
@@ -116,13 +116,6 @@
}
}
- /* XXX: CLEANUP: I'd like a cleaner interface for cleaning up
- memory after read_raw_pkgs_from_file */
- raw = raw_start;
- while (*raw) {
- free(*raw++);
- }
- free(raw_start);
return 0;
}
--- a/archival/libipkg/pkg_parse.c
+++ b/archival/libipkg/pkg_parse.c
@@ -224,6 +224,161 @@
Enhances, perhaps we could generalize all of these and save some
code duplication.
*/
+int pkg_parse_stream(pkg_t *pkg, FILE *stream, pkg_src_t *src, pkg_dest_t *dest)
+{
+ int reading_conffiles, reading_description;
+ int pkg_false_provides=1;
+ char ** lines;
+ char *provide=NULL;
+ char *buf, *scout;
+ int count = 0;
+ size_t size = 512;
+
+ buf = malloc (size);
+
+ pkg->src = src;
+ pkg->dest = dest;
+
+ reading_conffiles = reading_description = 0;
+
+ while (fgets(buf, size, stream)) {
+ while (strlen (buf) == (size - 1)
+ && buf[size-2] != '\n') {
+ size_t o = size - 1;
+ size *= 2;
+ buf = realloc (buf, size);
+ if (fgets (buf + o, size - o, stream) == NULL)
+ break;
+ }
+
+ if((scout = strchr(buf, '\n')))
+ *scout = '\0';
+
+ lines = &buf;
+ /* fprintf(stderr, "PARSING %s\n", *lines);*/
+ if(isGenericFieldType("Package:", *lines))
+ pkg->name = parseGenericFieldType("Package", *lines);
+ else if(isGenericFieldType("Architecture:", *lines))
+ pkg->architecture = parseGenericFieldType("Architecture", *lines);
+ else if(isGenericFieldType("Filename:", *lines))
+ pkg->filename = parseGenericFieldType("Filename", *lines);
+ else if(isGenericFieldType("Section:", *lines))
+ pkg->section = parseGenericFieldType("Section", *lines);
+ else if(isGenericFieldType("MD5sum:", *lines))
+ pkg->md5sum = parseGenericFieldType("MD5sum", *lines);
+ /* The old ipkg wrote out status files with the wrong case for MD5sum,
+ let's parse it either way */
+ else if(isGenericFieldType("MD5Sum:", *lines))
+ pkg->md5sum = parseGenericFieldType("MD5Sum", *lines);
+ else if(isGenericFieldType("Size:", *lines))
+ pkg->size = parseGenericFieldType("Size", *lines);
+ else if(isGenericFieldType("Source:", *lines))
+ pkg->source = parseGenericFieldType("Source", *lines);
+ else if(isGenericFieldType("Installed-Size:", *lines))
+ pkg->installed_size = parseGenericFieldType("Installed-Size", *lines);
+ else if(isGenericFieldType("Installed-Time:", *lines)) {
+ char *time_str = parseGenericFieldType("Installed-Time", *lines);
+ pkg->installed_time = strtoul(time_str, NULL, 0);
+ } else if(isGenericFieldType("Priority:", *lines))
+ pkg->priority = parseGenericFieldType("Priority", *lines);
+ else if(isGenericFieldType("Essential:", *lines)) {
+ char *essential_value;
+ essential_value = parseGenericFieldType("Essential", *lines);
+ if (strcmp(essential_value, "yes") == 0) {
+ pkg->essential = 1;
+ }
+ free(essential_value);
+ }
+ else if(isGenericFieldType("Status", *lines))
+ parseStatus(pkg, *lines);
+ else if(isGenericFieldType("Version", *lines))
+ parseVersion(pkg, *lines);
+ else if(isGenericFieldType("Maintainer", *lines))
+ pkg->maintainer = parseGenericFieldType("Maintainer", *lines);
+ else if(isGenericFieldType("Conffiles", *lines)){
+ parseConffiles(pkg, *lines);
+ reading_conffiles = 1;
+ }
+ else if(isGenericFieldType("Description", *lines)) {
+ pkg->description = parseGenericFieldType("Description", *lines);
+ reading_conffiles = 0;
+ reading_description = 1;
+ }
+
+ else if(isGenericFieldType("Provides", *lines)){
+/* Here we add the internal_use to align the off by one problem between provides_str and provides */
+ provide = (char * ) malloc(strlen(*lines)+ 35 ); /* Preparing the space for the new ipkg_internal_use_only */
+ if ( alterProvidesLine(*lines,provide) ){
+ return EINVAL;
+ }
+ pkg->provides_str = parseDependsString( provide, &pkg->provides_count);
+/* Let's try to hack a bit here.
+ The idea is that if a package has no Provides, we would add one generic, to permit the check of dependencies
+ in alot of other places. We will remove it before writing down the status database */
+ pkg_false_provides=0;
+ free(provide);
+ }
+
+ else if(isGenericFieldType("Depends", *lines))
+ pkg->depends_str = parseDependsString(*lines, &pkg->depends_count);
+ else if(isGenericFieldType("Pre-Depends", *lines))
+ pkg->pre_depends_str = parseDependsString(*lines, &pkg->pre_depends_count);
+ else if(isGenericFieldType("Recommends", *lines))
+ pkg->recommends_str = parseDependsString(*lines, &pkg->recommends_count);
+ else if(isGenericFieldType("Suggests", *lines))
+ pkg->suggests_str = parseDependsString(*lines, &pkg->suggests_count);
+ /* Abhaya: support for conflicts */
+ else if(isGenericFieldType("Conflicts", *lines))
+ pkg->conflicts_str = parseDependsString(*lines, &pkg->conflicts_count);
+ else if(isGenericFieldType("Replaces", *lines))
+ pkg->replaces_str = parseDependsString(*lines, &pkg->replaces_count);
+ else if(line_is_blank(*lines)) {
+ break;
+ }
+ else if(**lines == ' '){
+ if(reading_description) {
+ /* we already know it's not blank, so the rest of description */
+ pkg->description = realloc(pkg->description,
+ strlen(pkg->description)
+ + 1 + strlen(*lines) + 1);
+ strcat(pkg->description, "\n");
+ strcat(pkg->description, (*lines));
+ }
+ else if(reading_conffiles)
+ parseConffiles(pkg, *lines);
+ }
+ }
+/* If the ipk has not a Provides line, we insert our false line */
+ if ( pkg_false_provides==1)
+ pkg->provides_str = parseDependsString ((char *)"Provides: ipkg_internal_use_only ", &pkg->provides_count);
+
+ free(buf);
+ if (pkg->name) {
+ return 0;
+ } else {
+ return EINVAL;
+ }
+}
+
+#if 0
+
+/* Some random thoughts from Carl:
+
+ This function could be considerably simplified if we just kept
+ an array of all the generic string-valued field names, and looped
+ through those looking for a match. Also, these fields could perhaps
+ be stored in the package as an array as well, (or, probably better,
+ as an nv_pair_list_t).
+
+ Fields which require special parsing or storage, (such as Depends:
+ and Status:) could be handled as they are now.
+*/
+/* XXX: FEATURE: The Suggests: field needs to be changed from a string
+ to a dependency list. And, since we already have
+ Depends/Pre-Depends and need to add Conflicts, Recommends, and
+ Enhances, perhaps we could generalize all of these and save some
+ code duplication.
+*/
int pkg_parse_raw(pkg_t *pkg, char ***raw, pkg_src_t *src, pkg_dest_t *dest)
{
int reading_conffiles, reading_description;
@@ -342,6 +497,7 @@
return EINVAL;
}
}
+#endif
int pkg_valorize_other_field(pkg_t *pkg, char ***raw)
{
--- a/archival/libipkg/pkg_parse.h
+++ b/archival/libipkg/pkg_parse.h
@@ -25,7 +25,10 @@
char ** parseDependsString(char * raw, int * depends_count);
int parseVersion(pkg_t *pkg, char *raw);
void parseConffiles(pkg_t * pkg, char * raw);
+#if 0
int pkg_parse_raw(pkg_t *pkg, char ***raw, pkg_src_t *src, pkg_dest_t *dest);
+#endif
+int pkg_parse_stream(pkg_t *pkg, FILE *stream, pkg_src_t *src, pkg_dest_t *dest);
int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
#endif
|
