diff options
| author | Rob Landley <rob@landley.net> | 2005-10-08 17:48:25 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2005-10-08 17:48:25 +0000 |
| commit | 45ad0e87d679fd7fe09909577e539dfe95646e54 (patch) | |
| tree | d180f6ea523043ec4f858daf2793260a950dbc36 /coreutils/sort.c | |
| parent | 1ba19d6bf7445d80e93488af681285bda2e95dca (diff) | |
| download | busybox-45ad0e87d679fd7fe09909577e539dfe95646e54.tar.gz | |
Rename CONFIG_SORT_BIG to CONFIG_FEATURE_SORT_BIG so allbareconfig can find it.
Diffstat (limited to 'coreutils/sort.c')
| -rw-r--r-- | coreutils/sort.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/coreutils/sort.c b/coreutils/sort.c index 6d8a55245..ce51bc178 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c @@ -56,7 +56,7 @@ static int global_flags; #define FLAG_bb 32768 /* Ignore trailing blanks */ -#ifdef CONFIG_SORT_BIG +#ifdef CONFIG_FEATURE_SORT_BIG static char key_separator; static struct sort_key @@ -154,7 +154,7 @@ static int compare_keys(const void *xarg, const void *yarg) int flags=global_flags,retval=0; char *x,*y; -#ifdef CONFIG_SORT_BIG +#ifdef CONFIG_FEATURE_SORT_BIG struct sort_key *key; for(key=key_list;!retval && key;key=key->next_key) { @@ -178,7 +178,7 @@ static int compare_keys(const void *xarg, const void *yarg) case 0: retval=strcmp(x,y); break; -#ifdef CONFIG_SORT_BIG +#ifdef CONFIG_FEATURE_SORT_BIG case FLAG_g: { char *xx,*yy; @@ -232,6 +232,7 @@ static int compare_keys(const void *xarg, const void *yarg) /* Perform fallback sort if necessary */ if(!retval && !(global_flags&FLAG_s)) retval=strcmp(*(char **)xarg, *(char **)yarg); +//dprintf(2,"reverse=%d\n",flags&FLAG_r); return ((flags&FLAG_r)?-1:1)*retval; } @@ -248,7 +249,7 @@ int sort_main(int argc, char **argv) line=index(optlist,c); if(!line) bb_show_usage(); switch(*line) { -#ifdef CONFIG_SORT_BIG +#ifdef CONFIG_FEATURE_SORT_BIG case 'o': if(outfile) bb_error_msg_and_die("Too many -o."); outfile=bb_xfopen(optarg,"w"); @@ -308,7 +309,7 @@ int sort_main(int argc, char **argv) } fclose(fp); } -#ifdef CONFIG_SORT_BIG +#ifdef CONFIG_FEATURE_SORT_BIG /* if no key, perform alphabetic sort */ if(!key_list) add_key()->range[0]=1; /* handle -c */ |