diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2015-03-12 17:48:34 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-03-12 17:48:34 +0100 |
commit | 8dff01d06a7ebd7330e3a1dd1ba47b3c74ee7dfb (patch) | |
tree | 41c9dfbd45676c9e8737a7d8aa4361bbdfb40868 /networking | |
parent | 936c8809caea5705e26e5d7e06ea3895c28fffd8 (diff) | |
download | busybox-w32-8dff01d06a7ebd7330e3a1dd1ba47b3c74ee7dfb.tar.gz busybox-w32-8dff01d06a7ebd7330e3a1dd1ba47b3c74ee7dfb.tar.bz2 busybox-w32-8dff01d06a7ebd7330e3a1dd1ba47b3c74ee7dfb.zip |
libbb: introduce and use is_prefixed_with()
function old new delta
is_prefixed_with - 18 +18
complete_username 78 77 -1
man_main 737 735 -2
fsck_device 429 427 -2
unpack_ar_archive 80 76 -4
strip_unsafe_prefix 105 101 -4
singlemount 1054 1050 -4
rtc_adjtime_is_utc 90 86 -4
resolve_mount_spec 88 84 -4
parse_one_line 1029 1025 -4
parse_conf 1460 1456 -4
may_wakeup 83 79 -4
loadkmap_main 219 215 -4
get_irqs_from_stat 103 99 -4
get_header_cpio 913 909 -4
findfs_main 79 75 -4
fbsplash_main 1230 1226 -4
load_crontab 776 771 -5
expand_vars_to_list 1151 1146 -5
date_main 881 876 -5
skip_dev_pfx 30 24 -6
make_device 2199 2193 -6
complete_cmd_dir_file 773 767 -6
run_applet_and_exit 715 708 -7
uudecode_main 321 313 -8
pwdx_main 197 189 -8
execute 568 560 -8
i2cdetect_main 1186 1176 -10
procps_scan 1242 1230 -12
procps_read_smaps 1017 1005 -12
process_module 746 734 -12
patch_main 1903 1891 -12
nfsmount 3572 3560 -12
stack_machine 126 112 -14
process_timer_stats 449 435 -14
match_fstype 111 97 -14
do_ipaddr 1344 1330 -14
open_list_and_close 359 343 -16
get_header_tar 1795 1779 -16
prepend_new_eth_table 340 323 -17
fsck_main 1811 1794 -17
find_iface_state 56 38 -18
dnsd_main 1321 1303 -18
base_device 179 158 -21
find_keyword 104 82 -22
handle_incoming_and_exit 2785 2762 -23
parse_and_put_prompt 774 746 -28
modinfo 347 317 -30
find_action 204 171 -33
update_passwd 1470 1436 -34
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/49 up/down: 18/-540) Total: -522 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r-- | networking/dnsd.c | 2 | ||||
-rw-r--r-- | networking/httpd.c | 8 | ||||
-rw-r--r-- | networking/ifupdown.c | 10 | ||||
-rw-r--r-- | networking/inetd.c | 2 | ||||
-rw-r--r-- | networking/libiproute/ipaddress.c | 2 | ||||
-rw-r--r-- | networking/nameif.c | 8 | ||||
-rw-r--r-- | networking/netstat.c | 4 |
7 files changed, 18 insertions, 18 deletions
diff --git a/networking/dnsd.c b/networking/dnsd.c index fe98400f7..923ad6bc6 100644 --- a/networking/dnsd.c +++ b/networking/dnsd.c | |||
@@ -194,7 +194,7 @@ static char *table_lookup(struct dns_entry *d, | |||
194 | if ((len != 1 || d->name[1] != '*') | 194 | if ((len != 1 || d->name[1] != '*') |
195 | /* we assume (do not check) that query_string | 195 | /* we assume (do not check) that query_string |
196 | * ends in ".in-addr.arpa" */ | 196 | * ends in ".in-addr.arpa" */ |
197 | && strncmp(d->rip, query_string, strlen(d->rip)) == 0 | 197 | && is_prefixed_with(query_string, d->rip) |
198 | ) { | 198 | ) { |
199 | #if DEBUG | 199 | #if DEBUG |
200 | fprintf(stderr, "Found name:%s\n", d->name); | 200 | fprintf(stderr, "Found name:%s\n", d->name); |
diff --git a/networking/httpd.c b/networking/httpd.c index 9cf080401..7a9065fcc 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -697,7 +697,7 @@ static void parse_conf(const char *path, int flag) | |||
697 | goto config_error; | 697 | goto config_error; |
698 | } | 698 | } |
699 | *host_port++ = '\0'; | 699 | *host_port++ = '\0'; |
700 | if (strncmp(host_port, "http://", 7) == 0) | 700 | if (is_prefixed_with(host_port, "http://")) |
701 | host_port += 7; | 701 | host_port += 7; |
702 | if (*host_port == '\0') { | 702 | if (*host_port == '\0') { |
703 | goto config_error; | 703 | goto config_error; |
@@ -1894,7 +1894,7 @@ static Htaccess_Proxy *find_proxy_entry(const char *url) | |||
1894 | { | 1894 | { |
1895 | Htaccess_Proxy *p; | 1895 | Htaccess_Proxy *p; |
1896 | for (p = proxy; p; p = p->next) { | 1896 | for (p = proxy; p; p = p->next) { |
1897 | if (strncmp(url, p->url_from, strlen(p->url_from)) == 0) | 1897 | if (is_prefixed_with(url, p->url_from)) |
1898 | return p; | 1898 | return p; |
1899 | } | 1899 | } |
1900 | return NULL; | 1900 | return NULL; |
@@ -2183,7 +2183,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr) | |||
2183 | if (STRNCASECMP(iobuf, "Range:") == 0) { | 2183 | if (STRNCASECMP(iobuf, "Range:") == 0) { |
2184 | /* We know only bytes=NNN-[MMM] */ | 2184 | /* We know only bytes=NNN-[MMM] */ |
2185 | char *s = skip_whitespace(iobuf + sizeof("Range:")-1); | 2185 | char *s = skip_whitespace(iobuf + sizeof("Range:")-1); |
2186 | if (strncmp(s, "bytes=", 6) == 0) { | 2186 | if (is_prefixed_with(s, "bytes=") == 0) { |
2187 | s += sizeof("bytes=")-1; | 2187 | s += sizeof("bytes=")-1; |
2188 | range_start = BB_STRTOOFF(s, &s, 10); | 2188 | range_start = BB_STRTOOFF(s, &s, 10); |
2189 | if (s[0] != '-' || range_start < 0) { | 2189 | if (s[0] != '-' || range_start < 0) { |
@@ -2269,7 +2269,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr) | |||
2269 | tptr = urlcopy + 1; /* skip first '/' */ | 2269 | tptr = urlcopy + 1; /* skip first '/' */ |
2270 | 2270 | ||
2271 | #if ENABLE_FEATURE_HTTPD_CGI | 2271 | #if ENABLE_FEATURE_HTTPD_CGI |
2272 | if (strncmp(tptr, "cgi-bin/", 8) == 0) { | 2272 | if (is_prefixed_with(tptr, "cgi-bin/")) { |
2273 | if (tptr[8] == '\0') { | 2273 | if (tptr[8] == '\0') { |
2274 | /* protect listing "cgi-bin/" */ | 2274 | /* protect listing "cgi-bin/" */ |
2275 | send_headers_and_exit(HTTP_FORBIDDEN); | 2275 | send_headers_and_exit(HTTP_FORBIDDEN); |
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index c35d97a1a..daabeec0c 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c | |||
@@ -289,7 +289,7 @@ static char *parse(const char *command, struct interface_defn_t *ifd) | |||
289 | /* "hwaddress <class> <address>": | 289 | /* "hwaddress <class> <address>": |
290 | * unlike ifconfig, ip doesnt want <class> | 290 | * unlike ifconfig, ip doesnt want <class> |
291 | * (usually "ether" keyword). Skip it. */ | 291 | * (usually "ether" keyword). Skip it. */ |
292 | if (strncmp(command, "hwaddress", 9) == 0) { | 292 | if (is_prefixed_with(command, "hwaddress")) { |
293 | varvalue = skip_whitespace(skip_non_whitespace(varvalue)); | 293 | varvalue = skip_whitespace(skip_non_whitespace(varvalue)); |
294 | } | 294 | } |
295 | # endif | 295 | # endif |
@@ -298,7 +298,7 @@ static char *parse(const char *command, struct interface_defn_t *ifd) | |||
298 | # if ENABLE_FEATURE_IFUPDOWN_IP | 298 | # if ENABLE_FEATURE_IFUPDOWN_IP |
299 | /* Sigh... Add a special case for 'ip' to convert from | 299 | /* Sigh... Add a special case for 'ip' to convert from |
300 | * dotted quad to bit count style netmasks. */ | 300 | * dotted quad to bit count style netmasks. */ |
301 | if (strncmp(command, "bnmask", 6) == 0) { | 301 | if (is_prefixed_with(command, "bnmask")) { |
302 | unsigned res; | 302 | unsigned res; |
303 | varvalue = get_var("netmask", 7, ifd); | 303 | varvalue = get_var("netmask", 7, ifd); |
304 | if (varvalue) { | 304 | if (varvalue) { |
@@ -1159,12 +1159,12 @@ static char *run_mapping(char *physical, struct mapping_defn_t *map) | |||
1159 | 1159 | ||
1160 | static llist_t *find_iface_state(llist_t *state_list, const char *iface) | 1160 | static llist_t *find_iface_state(llist_t *state_list, const char *iface) |
1161 | { | 1161 | { |
1162 | unsigned iface_len = strlen(iface); | ||
1163 | llist_t *search = state_list; | 1162 | llist_t *search = state_list; |
1164 | 1163 | ||
1165 | while (search) { | 1164 | while (search) { |
1166 | if ((strncmp(search->data, iface, iface_len) == 0) | 1165 | char *after_iface = is_prefixed_with(search->data, iface); |
1167 | && (search->data[iface_len] == '=') | 1166 | if (after_iface |
1167 | && *after_iface == '=' | ||
1168 | ) { | 1168 | ) { |
1169 | return search; | 1169 | return search; |
1170 | } | 1170 | } |
diff --git a/networking/inetd.c b/networking/inetd.c index 8148925ce..dce5a0885 100644 --- a/networking/inetd.c +++ b/networking/inetd.c | |||
@@ -727,7 +727,7 @@ static NOINLINE servtab_t *parse_one_line(void) | |||
727 | goto parse_err; | 727 | goto parse_err; |
728 | #endif | 728 | #endif |
729 | } | 729 | } |
730 | if (strncmp(arg, "rpc/", 4) == 0) { | 730 | if (is_prefixed_with(arg, "rpc/")) { |
731 | #if ENABLE_FEATURE_INETD_RPC | 731 | #if ENABLE_FEATURE_INETD_RPC |
732 | unsigned n; | 732 | unsigned n; |
733 | arg += 4; | 733 | arg += 4; |
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c index aa4779ad1..4072d0626 100644 --- a/networking/libiproute/ipaddress.c +++ b/networking/libiproute/ipaddress.c | |||
@@ -701,7 +701,7 @@ static int ipaddr_modify(int cmd, char **argv) | |||
701 | /* There was no "dev IFACE", but we need that */ | 701 | /* There was no "dev IFACE", but we need that */ |
702 | bb_error_msg_and_die("need \"dev IFACE\""); | 702 | bb_error_msg_and_die("need \"dev IFACE\""); |
703 | } | 703 | } |
704 | if (l && strncmp(d, l, strlen(d)) != 0) { | 704 | if (l && !is_prefixed_with(l, d)) { |
705 | bb_error_msg_and_die("\"dev\" (%s) must match \"label\" (%s)", d, l); | 705 | bb_error_msg_and_die("\"dev\" (%s) must match \"label\" (%s)", d, l); |
706 | } | 706 | } |
707 | 707 | ||
diff --git a/networking/nameif.c b/networking/nameif.c index 9a8846dc0..9b18a6d16 100644 --- a/networking/nameif.c +++ b/networking/nameif.c | |||
@@ -161,19 +161,19 @@ static void nameif_parse_selector(ethtable_t *ch, char *selector) | |||
161 | if (*next) | 161 | if (*next) |
162 | *next++ = '\0'; | 162 | *next++ = '\0'; |
163 | /* Check for selectors, mac= is assumed */ | 163 | /* Check for selectors, mac= is assumed */ |
164 | if (strncmp(selector, "bus=", 4) == 0) { | 164 | if (is_prefixed_with(selector, "bus=")) { |
165 | ch->bus_info = xstrdup(selector + 4); | 165 | ch->bus_info = xstrdup(selector + 4); |
166 | found_selector++; | 166 | found_selector++; |
167 | } else if (strncmp(selector, "driver=", 7) == 0) { | 167 | } else if (is_prefixed_with(selector, "driver=")) { |
168 | ch->driver = xstrdup(selector + 7); | 168 | ch->driver = xstrdup(selector + 7); |
169 | found_selector++; | 169 | found_selector++; |
170 | } else if (strncmp(selector, "phyaddr=", 8) == 0) { | 170 | } else if (is_prefixed_with(selector, "phyaddr=")) { |
171 | ch->phy_address = xatoi_positive(selector + 8); | 171 | ch->phy_address = xatoi_positive(selector + 8); |
172 | found_selector++; | 172 | found_selector++; |
173 | } else { | 173 | } else { |
174 | #endif | 174 | #endif |
175 | lmac = xmalloc(ETH_ALEN); | 175 | lmac = xmalloc(ETH_ALEN); |
176 | ch->mac = ether_aton_r(selector + (strncmp(selector, "mac=", 4) != 0 ? 0 : 4), lmac); | 176 | ch->mac = ether_aton_r(selector + (is_prefixed_with(selector, "mac=") ? 4 : 0), lmac); |
177 | if (ch->mac == NULL) | 177 | if (ch->mac == NULL) |
178 | bb_error_msg_and_die("can't parse %s", selector); | 178 | bb_error_msg_and_die("can't parse %s", selector); |
179 | #if ENABLE_FEATURE_NAMEIF_EXTENDED | 179 | #if ENABLE_FEATURE_NAMEIF_EXTENDED |
diff --git a/networking/netstat.c b/networking/netstat.c index f80b845bc..02f4cc7cc 100644 --- a/networking/netstat.c +++ b/networking/netstat.c | |||
@@ -228,12 +228,12 @@ static long extract_socket_inode(const char *lname) | |||
228 | { | 228 | { |
229 | long inode = -1; | 229 | long inode = -1; |
230 | 230 | ||
231 | if (strncmp(lname, "socket:[", sizeof("socket:[")-1) == 0) { | 231 | if (is_prefixed_with(lname, "socket:[")) { |
232 | /* "socket:[12345]", extract the "12345" as inode */ | 232 | /* "socket:[12345]", extract the "12345" as inode */ |
233 | inode = bb_strtoul(lname + sizeof("socket:[")-1, (char**)&lname, 0); | 233 | inode = bb_strtoul(lname + sizeof("socket:[")-1, (char**)&lname, 0); |
234 | if (*lname != ']') | 234 | if (*lname != ']') |
235 | inode = -1; | 235 | inode = -1; |
236 | } else if (strncmp(lname, "[0000]:", sizeof("[0000]:")-1) == 0) { | 236 | } else if (is_prefixed_with(lname, "[0000]:")) { |
237 | /* "[0000]:12345", extract the "12345" as inode */ | 237 | /* "[0000]:12345", extract the "12345" as inode */ |
238 | inode = bb_strtoul(lname + sizeof("[0000]:")-1, NULL, 0); | 238 | inode = bb_strtoul(lname + sizeof("[0000]:")-1, NULL, 0); |
239 | if (errno) /* not NUL terminated? */ | 239 | if (errno) /* not NUL terminated? */ |