emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sort: code shrink

Browse Source 
function                                             old     new   delta
compare_keys                                         738     695     -43

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2015-10-19 19:13:06 +02:00
parent fd19faf705
commit d1ed3e68b8
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
coreutils/sort.c
View File

@ -291,7 +291,7 @@ static int compare_keys(const void *xarg, const void *yarg)
else if (!yy) else if (!yy)
retval = 1; retval = 1;
else else
retval = (dx == thyme.tm_mon) ? 0 : dx - thyme.tm_mon; retval = dx - thyme.tm_mon;
break; break;
} }
/* Full floating point version of -n */ /* Full floating point version of -n */
@ -317,8 +317,8 @@ static int compare_keys(const void *xarg, const void *yarg)
/* Perform fallback sort if necessary */ /* Perform fallback sort if necessary */
if (!retval && !(option_mask32 & FLAG_s)) { if (!retval && !(option_mask32 & FLAG_s)) {
retval = strcmp(*(char **)xarg, *(char **)yarg);
flags = option_mask32; flags = option_mask32;
retval = strcmp(*(char **)xarg, *(char **)yarg);
} }
if (flags & FLAG_r) if (flags & FLAG_r)
@ -346,7 +346,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
char *line, **lines; char *line, **lines;
char *str_ignored, *str_o, *str_t; char *str_ignored, *str_o, *str_t;
llist_t *lst_k = NULL; llist_t *lst_k = NULL;
int i, flag; int i;
int linecount; int linecount;
unsigned opts; unsigned opts;
@ -369,7 +369,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
/* note: below this point we use option_mask32, not opts, /* note: below this point we use option_mask32, not opts,
* since that reduces register pressure and makes code smaller */ * since that reduces register pressure and makes code smaller */
/* parse sort key */ /* Parse sort key */
while (lst_k) { while (lst_k) {
enum { enum {
FLAG_allowed_for_k = FLAG_allowed_for_k =
@ -396,17 +396,18 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
key->range[2*i+1] = str2u(&str_k); key->range[2*i+1] = str2u(&str_k);
} }
while (*str_k) { while (*str_k) {
const char *temp2; int flag;
const char *idx;
if (*str_k == ',' && !i++) { if (*str_k == ',' && !i++) {
str_k++; str_k++;
break; break;
} /* no else needed: fall through to syntax error } /* no else needed: fall through to syntax error
because comma isn't in OPT_STR */ because comma isn't in OPT_STR */
temp2 = strchr(OPT_STR, *str_k); idx = strchr(OPT_STR, *str_k);
if (!temp2) if (!idx)
bb_error_msg_and_die("unknown key option"); bb_error_msg_and_die("unknown key option");
flag = 1 << (temp2 - OPT_STR); flag = 1 << (idx - OPT_STR);
if (flag & ~FLAG_allowed_for_k) if (flag & ~FLAG_allowed_for_k)
bb_error_msg_and_die("unknown sort type"); bb_error_msg_and_die("unknown sort type");
/* b after ',' means strip _trailing_ space */ /* b after ',' means strip _trailing_ space */
@ -440,10 +441,10 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
} while (*++argv); } while (*++argv);
#if ENABLE_FEATURE_SORT_BIG #if ENABLE_FEATURE_SORT_BIG
/* if no key, perform alphabetic sort */ /* If no key, perform alphabetic sort */
if (!key_list) if (!key_list)
add_key()->range[0] = 1; add_key()->range[0] = 1;
/* handle -c */ /* Handle -c */
if (option_mask32 & FLAG_c) { if (option_mask32 & FLAG_c) {
int j = (option_mask32 & FLAG_u) ? -1 : 0; int j = (option_mask32 & FLAG_u) ? -1 : 0;
for (i = 1; i < linecount; i++) { for (i = 1; i < linecount; i++) {
@ -457,20 +458,21 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
#endif #endif
/* Perform the actual sort */ /* Perform the actual sort */
qsort(lines, linecount, sizeof(lines[0]), compare_keys); qsort(lines, linecount, sizeof(lines[0]), compare_keys);
/* handle -u */
/* Handle -u */
if (option_mask32 & FLAG_u) { if (option_mask32 & FLAG_u) {
flag = 0; int j = 0;
/* coreutils 6.3 drop lines for which only key is the same */ /* coreutils 6.3 drop lines for which only key is the same */
/* -- disabling last-resort compare... */ /* -- disabling last-resort compare... */
option_mask32 |= FLAG_s; option_mask32 |= FLAG_s;
for (i = 1; i < linecount; i++) { for (i = 1; i < linecount; i++) {
if (compare_keys(&lines[flag], &lines[i]) == 0) if (compare_keys(&lines[j], &lines[i]) == 0)
free(lines[i]); free(lines[i]);
else else
lines[++flag] = lines[i]; lines[++j] = lines[i];
} }
if (linecount) if (linecount)
linecount = flag+1; linecount = j+1;
} }
/* Print it */ /* Print it */
@ -479,9 +481,11 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
if (option_mask32 & FLAG_o) if (option_mask32 & FLAG_o)
xmove_fd(xopen(str_o, O_WRONLY|O_CREAT|O_TRUNC), STDOUT_FILENO); xmove_fd(xopen(str_o, O_WRONLY|O_CREAT|O_TRUNC), STDOUT_FILENO);
#endif #endif
flag = (option_mask32 & FLAG_z) ? '\0' : '\n'; {
for (i = 0; i < linecount; i++) int ch = (option_mask32 & FLAG_z) ? '\0' : '\n';
printf("%s%c", lines[i], flag); for (i = 0; i < linecount; i++)
printf("%s%c", lines[i], ch);
}
fflush_stdout_and_exit(EXIT_SUCCESS); fflush_stdout_and_exit(EXIT_SUCCESS);
} }