Deleted Added
sdiff udiff text old ( 262401 ) new ( 263180 )
full compact
config.c (262401) config.c (263180)
1/*-
2 * Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org>
3 * Copyright (c) 2013 Bryan Drewery <bdrewery@FreeBSD.org>
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org>
3 * Copyright (c) 2013 Bryan Drewery <bdrewery@FreeBSD.org>
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/usr.sbin/pkg/config.c 262401 2014-02-23 22:04:03Z bapt $");
29__FBSDID("$FreeBSD: head/usr.sbin/pkg/config.c 263180 2014-03-14 17:20:45Z bdrewery $");
30
31#include <sys/param.h>
32#include <sys/queue.h>
33#include <sys/sbuf.h>
34#include <sys/elf_common.h>
35#include <sys/endian.h>
36#include <sys/types.h>
37

--- 23 unchanged lines hidden (view full) ---

61
62struct config_entry {
63 uint8_t type;
64 const char *key;
65 const char *val;
66 char *value;
67 STAILQ_HEAD(, config_value) *list;
68 bool envset;
30
31#include <sys/param.h>
32#include <sys/queue.h>
33#include <sys/sbuf.h>
34#include <sys/elf_common.h>
35#include <sys/endian.h>
36#include <sys/types.h>
37

--- 23 unchanged lines hidden (view full) ---

61
62struct config_entry {
63 uint8_t type;
64 const char *key;
65 const char *val;
66 char *value;
67 STAILQ_HEAD(, config_value) *list;
68 bool envset;
69 bool main_only; /* Only set in pkg.conf. */
69};
70
71static struct config_entry c[] = {
72 [PACKAGESITE] = {
73 PKG_CONFIG_STRING,
74 "PACKAGESITE",
75 URL_SCHEME_PREFIX "http://pkg.FreeBSD.org/${ABI}/latest",
76 NULL,
77 NULL,
78 false,
70};
71
72static struct config_entry c[] = {
73 [PACKAGESITE] = {
74 PKG_CONFIG_STRING,
75 "PACKAGESITE",
76 URL_SCHEME_PREFIX "http://pkg.FreeBSD.org/${ABI}/latest",
77 NULL,
78 NULL,
79 false,
80 false,
79 },
80 [ABI] = {
81 PKG_CONFIG_STRING,
82 "ABI",
83 NULL,
84 NULL,
85 NULL,
86 false,
81 },
82 [ABI] = {
83 PKG_CONFIG_STRING,
84 "ABI",
85 NULL,
86 NULL,
87 NULL,
88 false,
89 true,
87 },
88 [MIRROR_TYPE] = {
89 PKG_CONFIG_STRING,
90 "MIRROR_TYPE",
91 "SRV",
92 NULL,
93 NULL,
94 false,
90 },
91 [MIRROR_TYPE] = {
92 PKG_CONFIG_STRING,
93 "MIRROR_TYPE",
94 "SRV",
95 NULL,
96 NULL,
97 false,
98 false,
95 },
96 [ASSUME_ALWAYS_YES] = {
97 PKG_CONFIG_BOOL,
98 "ASSUME_ALWAYS_YES",
99 "NO",
100 NULL,
101 NULL,
102 false,
99 },
100 [ASSUME_ALWAYS_YES] = {
101 PKG_CONFIG_BOOL,
102 "ASSUME_ALWAYS_YES",
103 "NO",
104 NULL,
105 NULL,
106 false,
107 true,
103 },
104 [SIGNATURE_TYPE] = {
105 PKG_CONFIG_STRING,
106 "SIGNATURE_TYPE",
107 NULL,
108 NULL,
109 NULL,
110 false,
108 },
109 [SIGNATURE_TYPE] = {
110 PKG_CONFIG_STRING,
111 "SIGNATURE_TYPE",
112 NULL,
113 NULL,
114 NULL,
115 false,
116 false,
111 },
112 [FINGERPRINTS] = {
113 PKG_CONFIG_STRING,
114 "FINGERPRINTS",
115 NULL,
116 NULL,
117 NULL,
118 false,
117 },
118 [FINGERPRINTS] = {
119 PKG_CONFIG_STRING,
120 "FINGERPRINTS",
121 NULL,
122 NULL,
123 NULL,
124 false,
125 false,
119 },
120 [REPOS_DIR] = {
121 PKG_CONFIG_LIST,
122 "REPOS_DIR",
123 NULL,
124 NULL,
125 NULL,
126 false,
126 },
127 [REPOS_DIR] = {
128 PKG_CONFIG_LIST,
129 "REPOS_DIR",
130 NULL,
131 NULL,
132 NULL,
133 false,
134 true,
127 },
128};
129
130static const char *
131elf_corres_to_string(struct _elf_corres *m, int e)
132{
133 int i;
134

--- 457 unchanged lines hidden (view full) ---

592 break;
593 }
594 }
595
596 /* Repo is enabled, copy over all settings from temp_config. */
597 for (i = 0; i < CONFIG_SIZE; i++) {
598 if (c[i].envset)
599 continue;
135 },
136};
137
138static const char *
139elf_corres_to_string(struct _elf_corres *m, int e)
140{
141 int i;
142

--- 457 unchanged lines hidden (view full) ---

600 break;
601 }
602 }
603
604 /* Repo is enabled, copy over all settings from temp_config. */
605 for (i = 0; i < CONFIG_SIZE; i++) {
606 if (c[i].envset)
607 continue;
608 /* Prevent overriding ABI, ASSUME_ALWAYS_YES, etc. */
609 if (conftype != CONFFILE_PKG && c[i].main_only == true)
610 continue;
600 switch (c[i].type) {
601 case PKG_CONFIG_LIST:
602 c[i].list = temp_config[i].list;
603 break;
604 default:
605 c[i].value = temp_config[i].value;
606 break;
607 }

--- 227 unchanged lines hidden --- 		611 switch (c[i].type) {
612 case PKG_CONFIG_LIST:
613 c[i].list = temp_config[i].list;
614 break;
615 default:
616 c[i].value = temp_config[i].value;
617 break;
618 }

--- 227 unchanged lines hidden ---