1 #define USE_THE_REPOSITORY_VARIABLE
2 #define DISABLE_SIGN_COMPARE_WARNINGS
4 #include "git-compat-util.h"
5 #include "bundle-uri.h"
10 #include "run-command.h"
14 #include "fetch-pack.h"
20 enum bundle_list_heuristic heuristic
;
22 } heuristics
[BUNDLE_HEURISTIC__COUNT
] = {
23 { BUNDLE_HEURISTIC_NONE
, ""},
24 { BUNDLE_HEURISTIC_CREATIONTOKEN
, "creationToken" },
27 static int compare_bundles(const void *hashmap_cmp_fn_data UNUSED
,
28 const struct hashmap_entry
*he1
,
29 const struct hashmap_entry
*he2
,
32 const struct remote_bundle_info
*e1
=
33 container_of(he1
, const struct remote_bundle_info
, ent
);
34 const struct remote_bundle_info
*e2
=
35 container_of(he2
, const struct remote_bundle_info
, ent
);
37 return strcmp(e1
->id
, id
? (const char *)id
: e2
->id
);
40 void init_bundle_list(struct bundle_list
*list
)
42 memset(list
, 0, sizeof(*list
));
44 /* Implied defaults. */
45 list
->mode
= BUNDLE_MODE_ALL
;
48 hashmap_init(&list
->bundles
, compare_bundles
, NULL
, 0);
51 static int clear_remote_bundle_info(struct remote_bundle_info
*bundle
,
54 FREE_AND_NULL(bundle
->id
);
55 FREE_AND_NULL(bundle
->uri
);
56 FREE_AND_NULL(bundle
->file
);
57 bundle
->unbundled
= 0;
61 void clear_bundle_list(struct bundle_list
*list
)
66 for_all_bundles_in_list(list
, clear_remote_bundle_info
, NULL
);
67 hashmap_clear_and_free(&list
->bundles
, struct remote_bundle_info
, ent
);
71 int for_all_bundles_in_list(struct bundle_list
*list
,
75 struct remote_bundle_info
*info
;
76 struct hashmap_iter i
;
78 hashmap_for_each_entry(&list
->bundles
, &i
, info
, ent
) {
79 int result
= iter(info
, data
);
88 static int summarize_bundle(struct remote_bundle_info
*info
, void *data
)
91 fprintf(fp
, "[bundle \"%s\"]\n", info
->id
);
92 fprintf(fp
, "\turi = %s\n", info
->uri
);
94 if (info
->creationToken
)
95 fprintf(fp
, "\tcreationToken = %"PRIu64
"\n", info
->creationToken
);
99 void print_bundle_list(FILE *fp
, struct bundle_list
*list
)
103 switch (list
->mode
) {
104 case BUNDLE_MODE_ALL
:
108 case BUNDLE_MODE_ANY
:
112 case BUNDLE_MODE_NONE
:
117 fprintf(fp
, "[bundle]\n");
118 fprintf(fp
, "\tversion = %d\n", list
->version
);
119 fprintf(fp
, "\tmode = %s\n", mode
);
121 if (list
->heuristic
) {
123 for (i
= 0; i
< BUNDLE_HEURISTIC__COUNT
; i
++) {
124 if (heuristics
[i
].heuristic
== list
->heuristic
) {
125 fprintf(fp
, "\theuristic = %s\n",
126 heuristics
[list
->heuristic
].name
);
132 for_all_bundles_in_list(list
, summarize_bundle
, fp
);
136 * Given a key-value pair, update the state of the given bundle list.
137 * Returns 0 if the key-value pair is understood. Returns -1 if the key
138 * is not understood or the value is malformed.
140 static int bundle_list_update(const char *key
, const char *value
,
141 struct bundle_list
*list
)
143 struct strbuf id
= STRBUF_INIT
;
144 struct remote_bundle_info lookup
= REMOTE_BUNDLE_INFO_INIT
;
145 struct remote_bundle_info
*bundle
;
146 const char *subsection
, *subkey
;
147 size_t subsection_len
;
149 if (parse_config_key(key
, "bundle", &subsection
, &subsection_len
, &subkey
))
152 if (!subsection_len
) {
153 if (!strcmp(subkey
, "version")) {
155 if (!git_parse_int(value
, &version
))
160 list
->version
= version
;
164 if (!strcmp(subkey
, "mode")) {
165 if (!strcmp(value
, "all"))
166 list
->mode
= BUNDLE_MODE_ALL
;
167 else if (!strcmp(value
, "any"))
168 list
->mode
= BUNDLE_MODE_ANY
;
174 if (!strcmp(subkey
, "heuristic")) {
176 for (i
= 0; i
< BUNDLE_HEURISTIC__COUNT
; i
++) {
177 if (heuristics
[i
].heuristic
&&
178 heuristics
[i
].name
&&
179 !strcmp(value
, heuristics
[i
].name
)) {
180 list
->heuristic
= heuristics
[i
].heuristic
;
185 /* Ignore unknown heuristics. */
189 /* Ignore other unknown global keys. */
193 strbuf_add(&id
, subsection
, subsection_len
);
196 * Check for an existing bundle with this <id>, or create one
200 hashmap_entry_init(&lookup
.ent
, strhash(lookup
.id
));
201 if (!(bundle
= hashmap_get_entry(&list
->bundles
, &lookup
, ent
, NULL
))) {
202 CALLOC_ARRAY(bundle
, 1);
203 bundle
->id
= strbuf_detach(&id
, NULL
);
204 hashmap_entry_init(&bundle
->ent
, strhash(bundle
->id
));
205 hashmap_add(&list
->bundles
, &bundle
->ent
);
209 if (!strcmp(subkey
, "uri")) {
212 bundle
->uri
= relative_url(list
->baseURI
, value
, NULL
);
216 if (!strcmp(subkey
, "creationtoken")) {
217 if (sscanf(value
, "%"PRIu64
, &bundle
->creationToken
) != 1)
218 warning(_("could not parse bundle list key %s with value '%s'"),
219 "creationToken", value
);
224 * At this point, we ignore any information that we don't
225 * understand, assuming it to be hints for a heuristic the client
226 * does not currently understand.
231 static int config_to_bundle_list(const char *key
, const char *value
,
232 const struct config_context
*ctx UNUSED
,
235 struct bundle_list
*list
= data
;
236 return bundle_list_update(key
, value
, list
);
239 int bundle_uri_parse_config_format(const char *uri
,
240 const char *filename
,
241 struct bundle_list
*list
)
244 struct config_options opts
= {
245 .error_action
= CONFIG_ERROR_ERROR
,
248 if (!list
->baseURI
) {
249 struct strbuf baseURI
= STRBUF_INIT
;
250 strbuf_addstr(&baseURI
, uri
);
253 * If the URI does not end with a trailing slash, then
254 * remove the filename portion of the path. This is
255 * important for relative URIs.
257 strbuf_strip_file_from_path(&baseURI
);
258 list
->baseURI
= strbuf_detach(&baseURI
, NULL
);
260 result
= git_config_from_file_with_options(config_to_bundle_list
,
262 CONFIG_SCOPE_UNKNOWN
,
265 if (!result
&& list
->mode
== BUNDLE_MODE_NONE
) {
266 warning(_("bundle list at '%s' has no mode"), uri
);
273 static char *find_temp_filename(void)
276 struct strbuf name
= STRBUF_INIT
;
278 * Find a temporary filename that is available. This is briefly
279 * racy, but unlikely to collide.
281 fd
= odb_mkstemp(the_repository
->objects
, &name
,
282 "bundles/tmp_uri_XXXXXX");
284 warning(_("failed to create temporary file"));
290 return strbuf_detach(&name
, NULL
);
293 static int download_https_uri_to_file(const char *file
, const char *uri
)
296 struct child_process cp
= CHILD_PROCESS_INIT
;
297 FILE *child_in
= NULL
, *child_out
= NULL
;
298 struct strbuf line
= STRBUF_INIT
;
302 * The protocol we speak with git-remote-https(1) uses a space to
303 * separate between URI and file, so the URI itself must not contain a
304 * space. If it did, an adversary could change the location where the
305 * downloaded file is being written to.
307 * Similarly, we use newlines to separate commands from one another.
308 * Consequently, neither the URI nor the file must contain a newline or
309 * otherwise an adversary could inject arbitrary commands.
311 * TODO: Restricting newlines in the target paths may break valid
312 * usecases, even if those are a bit more on the esoteric side.
313 * If this ever becomes a problem we should probably think about
314 * alternatives. One alternative could be to use NUL-delimited
315 * requests in git-remote-http(1). Another alternative could be
316 * to use URL quoting.
318 if (strpbrk(uri
, " \n"))
319 return error("bundle-uri: URI is malformed: '%s'", file
);
320 if (strchr(file
, '\n'))
321 return error("bundle-uri: filename is malformed: '%s'", file
);
323 strvec_pushl(&cp
.args
, "git-remote-https", uri
, NULL
);
328 if (start_command(&cp
))
331 child_in
= fdopen(cp
.in
, "w");
337 child_out
= fdopen(cp
.out
, "r");
343 fprintf(child_in
, "capabilities\n");
346 while (!strbuf_getline(&line
, child_out
)) {
349 if (!strcmp(line
.buf
, "get"))
352 strbuf_release(&line
);
355 result
= error(_("insufficient capabilities"));
359 fprintf(child_in
, "get %s %s\n\n", uri
, file
);
364 if (finish_command(&cp
))
371 static int copy_uri_to_file(const char *filename
, const char *uri
)
375 if (starts_with(uri
, "https:") ||
376 starts_with(uri
, "http:"))
377 return download_https_uri_to_file(filename
, uri
);
379 if (skip_prefix(uri
, "file://", &out
))
383 return copy_file(filename
, uri
, 0);
386 static int unbundle_from_file(struct repository
*r
, const char *file
)
390 struct bundle_header header
= BUNDLE_HEADER_INIT
;
391 struct string_list_item
*refname
;
392 struct strbuf bundle_ref
= STRBUF_INIT
;
393 size_t bundle_prefix_len
;
394 struct unbundle_opts opts
= {
395 .flags
= VERIFY_BUNDLE_QUIET
|
396 (fetch_pack_fsck_objects() ? VERIFY_BUNDLE_FSCK
: 0),
399 bundle_fd
= read_bundle_header(file
, &header
);
406 * Skip the reachability walk here, since we will be adding
407 * a reachable ref pointing to the new tips, which will reach
408 * the prerequisite commits.
410 result
= unbundle(r
, &header
, bundle_fd
, NULL
, &opts
);
417 * Convert all refs/heads/ from the bundle into refs/bundles/
418 * in the local repository.
420 strbuf_addstr(&bundle_ref
, "refs/bundles/");
421 bundle_prefix_len
= bundle_ref
.len
;
423 for_each_string_list_item(refname
, &header
.references
) {
424 struct object_id
*oid
= refname
->util
;
425 struct object_id old_oid
;
426 const char *branch_name
;
429 if (!skip_prefix(refname
->string
, "refs/", &branch_name
))
432 strbuf_setlen(&bundle_ref
, bundle_prefix_len
);
433 strbuf_addstr(&bundle_ref
, branch_name
);
435 has_old
= !refs_read_ref(get_main_ref_store(the_repository
),
436 bundle_ref
.buf
, &old_oid
);
437 refs_update_ref(get_main_ref_store(the_repository
),
438 "fetched bundle", bundle_ref
.buf
, oid
,
439 has_old
? &old_oid
: NULL
,
440 0, UPDATE_REFS_MSG_ON_ERR
);
444 strbuf_release(&bundle_ref
);
445 bundle_header_release(&header
);
449 struct bundle_list_context
{
450 struct repository
*r
;
451 struct bundle_list
*list
;
452 enum bundle_list_mode mode
;
458 * This early definition is necessary because we use indirect recursion:
460 * While iterating through a bundle list that was downloaded as part
461 * of fetch_bundle_uri_internal(), iterator methods eventually call it
462 * again, but with depth + 1.
464 static int fetch_bundle_uri_internal(struct repository
*r
,
465 struct remote_bundle_info
*bundle
,
467 struct bundle_list
*list
);
469 static int download_bundle_to_file(struct remote_bundle_info
*bundle
, void *data
)
472 struct bundle_list_context
*ctx
= data
;
474 if (ctx
->mode
== BUNDLE_MODE_ANY
&& ctx
->count
)
477 res
= fetch_bundle_uri_internal(ctx
->r
, bundle
, ctx
->depth
+ 1, ctx
->list
);
480 * Only increment count if the download succeeded. If our mode is
481 * BUNDLE_MODE_ANY, then we will want to try other URIs in the
482 * list in case they work instead.
488 * To be opportunistic as possible, we continue iterating and
489 * download as many bundles as we can, so we can apply the ones
490 * that work, even in BUNDLE_MODE_ALL mode.
495 struct bundles_for_sorting
{
496 struct remote_bundle_info
**items
;
501 static int append_bundle(struct remote_bundle_info
*bundle
, void *data
)
503 struct bundles_for_sorting
*list
= data
;
504 list
->items
[list
->nr
++] = bundle
;
509 * For use in QSORT() to get a list sorted by creationToken
510 * in decreasing order.
512 static int compare_creation_token_decreasing(const void *va
, const void *vb
)
514 const struct remote_bundle_info
* const *a
= va
;
515 const struct remote_bundle_info
* const *b
= vb
;
517 if ((*a
)->creationToken
> (*b
)->creationToken
)
519 if ((*a
)->creationToken
< (*b
)->creationToken
)
524 static int fetch_bundles_by_token(struct repository
*r
,
525 struct bundle_list
*list
)
528 int move_direction
= 0;
529 const char *creationTokenStr
;
530 uint64_t maxCreationToken
= 0, newMaxCreationToken
= 0;
531 struct bundle_list_context ctx
= {
536 struct bundles_for_sorting bundles
= {
537 .alloc
= hashmap_get_size(&list
->bundles
),
540 ALLOC_ARRAY(bundles
.items
, bundles
.alloc
);
542 for_all_bundles_in_list(list
, append_bundle
, &bundles
);
549 QSORT(bundles
.items
, bundles
.nr
, compare_creation_token_decreasing
);
552 * If fetch.bundleCreationToken exists, parses to a uint64t, and
553 * is not strictly smaller than the maximum creation token in the
554 * bundle list, then do not download any bundles.
556 if (!repo_config_get_value(r
,
557 "fetch.bundlecreationtoken",
558 &creationTokenStr
)) {
559 if (sscanf(creationTokenStr
, "%"PRIu64
, &maxCreationToken
) != 1)
560 maxCreationToken
= 0;
561 if (bundles
.items
[0]->creationToken
<= maxCreationToken
) {
568 * Attempt to download and unbundle the minimum number of bundles by
569 * creationToken in decreasing order. If we fail to unbundle (after
570 * a successful download) then move to the next non-downloaded bundle
571 * and attempt downloading. Once we succeed in applying a bundle,
572 * move to the previous unapplied bundle and attempt to unbundle it
575 * In the case of a fresh clone, we will likely download all of the
576 * bundles before successfully unbundling the oldest one, then the
577 * rest of the bundles unbundle successfully in increasing order
580 * If there are existing objects, then this process may terminate
581 * early when all required commits from "new" bundles exist in the
582 * repo's object store.
585 while (cur
>= 0 && cur
< bundles
.nr
) {
586 struct remote_bundle_info
*bundle
= bundles
.items
[cur
];
589 * If we need to dig into bundles below the previous
590 * creation token value, then likely we are in an erroneous
591 * state due to missing or invalid bundles. Halt the process
592 * instead of continuing to download extra data.
594 if (bundle
->creationToken
<= maxCreationToken
)
599 * Not downloaded yet. Try downloading.
601 * Note that bundle->file is non-NULL if a download
602 * was attempted, even if it failed to download.
604 if (fetch_bundle_uri_internal(ctx
.r
, bundle
, ctx
.depth
+ 1, ctx
.list
)) {
605 /* Mark as unbundled so we do not retry. */
606 bundle
->unbundled
= 1;
608 /* Try looking deeper in the list. */
613 /* We expect bundles when using creationTokens. */
614 if (!is_bundle(bundle
->file
, 1)) {
615 warning(_("file downloaded from '%s' is not a bundle"),
621 if (bundle
->file
&& !bundle
->unbundled
) {
623 * This was downloaded, but not successfully
624 * unbundled. Try unbundling again.
626 if (unbundle_from_file(ctx
.r
, bundle
->file
)) {
627 /* Try looking deeper in the list. */
631 * Succeeded in unbundle. Retry bundles
632 * that previously failed to unbundle.
635 bundle
->unbundled
= 1;
637 if (bundle
->creationToken
> newMaxCreationToken
)
638 newMaxCreationToken
= bundle
->creationToken
;
643 * Else case: downloaded and unbundled successfully.
644 * Skip this by moving in the same direction as the
649 /* Move in the specified direction and repeat. */
650 cur
+= move_direction
;
654 * We succeed if the loop terminates because 'cur' drops below
655 * zero. The other case is that we terminate because 'cur'
656 * reaches the end of the list, so we have a failure no matter
657 * which bundles we apply from the list.
660 struct strbuf value
= STRBUF_INIT
;
661 strbuf_addf(&value
, "%"PRIu64
"", newMaxCreationToken
);
662 if (repo_config_set_multivar_gently(ctx
.r
,
663 "fetch.bundleCreationToken",
665 warning(_("failed to store maximum creation token"));
667 strbuf_release(&value
);
674 static int download_bundle_list(struct repository
*r
,
675 struct bundle_list
*local_list
,
676 struct bundle_list
*global_list
,
679 struct bundle_list_context ctx
= {
683 .mode
= local_list
->mode
,
686 return for_all_bundles_in_list(local_list
, download_bundle_to_file
, &ctx
);
689 static int fetch_bundle_list_in_config_format(struct repository
*r
,
690 struct bundle_list
*global_list
,
691 struct remote_bundle_info
*bundle
,
695 struct bundle_list list_from_bundle
;
697 init_bundle_list(&list_from_bundle
);
699 if ((result
= bundle_uri_parse_config_format(bundle
->uri
,
704 if (list_from_bundle
.mode
== BUNDLE_MODE_NONE
) {
705 warning(_("unrecognized bundle mode from URI '%s'"),
712 * If this list uses the creationToken heuristic, then the URIs
713 * it advertises are expected to be bundles, not nested lists.
714 * We can drop 'global_list' and 'depth'.
716 if (list_from_bundle
.heuristic
== BUNDLE_HEURISTIC_CREATIONTOKEN
) {
717 result
= fetch_bundles_by_token(r
, &list_from_bundle
);
718 global_list
->heuristic
= BUNDLE_HEURISTIC_CREATIONTOKEN
;
719 } else if ((result
= download_bundle_list(r
, &list_from_bundle
,
720 global_list
, depth
)))
724 clear_bundle_list(&list_from_bundle
);
729 * This limits the recursion on fetch_bundle_uri_internal() when following
732 static int max_bundle_uri_depth
= 4;
735 * Recursively download all bundles advertised at the given URI
736 * to files. If the file is a bundle, then add it to the given
737 * 'list'. Otherwise, expect a bundle list and recurse on the
738 * URIs in that list according to the list mode (ANY or ALL).
740 static int fetch_bundle_uri_internal(struct repository
*r
,
741 struct remote_bundle_info
*bundle
,
743 struct bundle_list
*list
)
746 struct remote_bundle_info
*bcopy
;
748 if (depth
>= max_bundle_uri_depth
) {
749 warning(_("exceeded bundle URI recursion limit (%d)"),
750 max_bundle_uri_depth
);
755 !(bundle
->file
= find_temp_filename())) {
760 if ((result
= copy_uri_to_file(bundle
->file
, bundle
->uri
))) {
761 warning(_("failed to download bundle from URI '%s'"), bundle
->uri
);
765 if ((result
= !is_bundle(bundle
->file
, 1))) {
766 result
= fetch_bundle_list_in_config_format(
767 r
, list
, bundle
, depth
);
769 warning(_("file at URI '%s' is not a bundle or bundle list"),
774 /* Copy the bundle and insert it into the global list. */
775 CALLOC_ARRAY(bcopy
, 1);
776 bcopy
->id
= xstrdup(bundle
->id
);
777 bcopy
->file
= xstrdup(bundle
->file
);
778 hashmap_entry_init(&bcopy
->ent
, strhash(bcopy
->id
));
779 hashmap_add(&list
->bundles
, &bcopy
->ent
);
782 if (result
&& bundle
->file
)
783 unlink(bundle
->file
);
788 * This loop iterator breaks the loop with nonzero return code on the
789 * first successful unbundling of a bundle.
791 static int attempt_unbundle(struct remote_bundle_info
*info
, void *data
)
793 struct repository
*r
= data
;
795 if (!info
->file
|| info
->unbundled
)
798 if (!unbundle_from_file(r
, info
->file
)) {
806 static int unbundle_all_bundles(struct repository
*r
,
807 struct bundle_list
*list
)
810 * Iterate through all bundles looking for ones that can
811 * successfully unbundle. If any succeed, then perhaps another
812 * will succeed in the next attempt.
814 * Keep in mind that a non-zero result for the loop here means
815 * the loop terminated early on a successful unbundling, which
816 * signals that we can try again.
818 while (for_all_bundles_in_list(list
, attempt_unbundle
, r
)) ;
823 static int unlink_bundle(struct remote_bundle_info
*info
, void *data UNUSED
)
826 unlink_or_warn(info
->file
);
830 int fetch_bundle_uri(struct repository
*r
, const char *uri
,
834 struct bundle_list list
;
835 struct remote_bundle_info bundle
= {
840 trace2_region_enter("fetch", "fetch-bundle-uri", the_repository
);
842 init_bundle_list(&list
);
845 * Do not fetch an empty bundle URI. An empty bundle URI
846 * could signal that a configured bundle URI has been disabled.
853 /* If a bundle is added to this global list, then it is required. */
854 list
.mode
= BUNDLE_MODE_ALL
;
856 if ((result
= fetch_bundle_uri_internal(r
, &bundle
, 0, &list
)))
859 result
= unbundle_all_bundles(r
, &list
);
863 *has_heuristic
= (list
.heuristic
!= BUNDLE_HEURISTIC_NONE
);
864 for_all_bundles_in_list(&list
, unlink_bundle
, NULL
);
865 clear_bundle_list(&list
);
866 clear_remote_bundle_info(&bundle
, NULL
);
867 trace2_region_leave("fetch", "fetch-bundle-uri", the_repository
);
871 int fetch_bundle_list(struct repository
*r
, struct bundle_list
*list
)
874 struct bundle_list global_list
;
877 * If the creationToken heuristic is used, then the URIs
878 * advertised by 'list' are not nested lists and instead
879 * direct bundles. We do not need to use global_list.
881 if (list
->heuristic
== BUNDLE_HEURISTIC_CREATIONTOKEN
)
882 return fetch_bundles_by_token(r
, list
);
884 init_bundle_list(&global_list
);
886 /* If a bundle is added to this global list, then it is required. */
887 global_list
.mode
= BUNDLE_MODE_ALL
;
889 if ((result
= download_bundle_list(r
, list
, &global_list
, 0)))
892 if (list
->heuristic
== BUNDLE_HEURISTIC_CREATIONTOKEN
)
893 result
= fetch_bundles_by_token(r
, list
);
895 result
= unbundle_all_bundles(r
, &global_list
);
898 for_all_bundles_in_list(&global_list
, unlink_bundle
, NULL
);
899 clear_bundle_list(&global_list
);
907 int bundle_uri_advertise(struct repository
*r
, struct strbuf
*value UNUSED
)
909 static int advertise_bundle_uri
= -1;
911 if (advertise_bundle_uri
!= -1)
914 advertise_bundle_uri
= 0;
915 repo_config_get_maybe_bool(r
, "uploadpack.advertisebundleuris", &advertise_bundle_uri
);
918 return advertise_bundle_uri
;
921 static int config_to_packet_line(const char *key
, const char *value
,
922 const struct config_context
*ctx UNUSED
,
925 struct packet_reader
*writer
= data
;
927 if (starts_with(key
, "bundle."))
928 packet_write_fmt(writer
->fd
, "%s=%s", key
, value
);
933 int bundle_uri_command(struct repository
*r
,
934 struct packet_reader
*request
)
936 struct packet_writer writer
;
937 packet_writer_init(&writer
, 1);
939 while (packet_reader_read(request
) == PACKET_READ_NORMAL
)
940 die(_("bundle-uri: unexpected argument: '%s'"), request
->line
);
941 if (request
->status
!= PACKET_READ_FLUSH
)
942 die(_("bundle-uri: expected flush after arguments"));
945 * Read all "bundle.*" config lines to the client as key=value
948 repo_config(r
, config_to_packet_line
, &writer
);
950 packet_writer_flush(&writer
);
956 * General API for {transport,connect}.c etc.
958 int bundle_uri_parse_line(struct bundle_list
*list
, const char *line
)
962 struct strbuf key
= STRBUF_INIT
;
965 return error(_("bundle-uri: got an empty line"));
967 equals
= strchr(line
, '=');
970 return error(_("bundle-uri: line is not of the form 'key=value'"));
971 if (line
== equals
|| !*(equals
+ 1))
972 return error(_("bundle-uri: line has empty key or value"));
974 strbuf_add(&key
, line
, equals
- line
);
975 result
= bundle_list_update(key
.buf
, equals
+ 1, list
);
976 strbuf_release(&key
);