aboutsummaryrefslogtreecommitdiff
path: root/coreutils/sort.c
diff options
context:
space:
mode:
authorlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-10-08 17:48:25 +0000
committerlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-10-08 17:48:25 +0000
commit68760801d6de36842614248a1dc67ff428a5128b (patch)
treed180f6ea523043ec4f858daf2793260a950dbc36 /coreutils/sort.c
parentefb539ae510ae5b4cab4b30a797fa4e1a2d10e1b (diff)
downloadbusybox-w32-68760801d6de36842614248a1dc67ff428a5128b.tar.gz
busybox-w32-68760801d6de36842614248a1dc67ff428a5128b.tar.bz2
busybox-w32-68760801d6de36842614248a1dc67ff428a5128b.zip
Rename CONFIG_SORT_BIG to CONFIG_FEATURE_SORT_BIG so allbareconfig can find it.
git-svn-id: svn://busybox.net/trunk/busybox@11811 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils/sort.c')
-rw-r--r--coreutils/sort.c11
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;
56#define FLAG_bb 32768 /* Ignore trailing blanks */ 56#define FLAG_bb 32768 /* Ignore trailing blanks */
57 57
58 58
59#ifdef CONFIG_SORT_BIG 59#ifdef CONFIG_FEATURE_SORT_BIG
60static char key_separator; 60static char key_separator;
61 61
62static struct sort_key 62static struct sort_key
@@ -154,7 +154,7 @@ static int compare_keys(const void *xarg, const void *yarg)
154 int flags=global_flags,retval=0; 154 int flags=global_flags,retval=0;
155 char *x,*y; 155 char *x,*y;
156 156
157#ifdef CONFIG_SORT_BIG 157#ifdef CONFIG_FEATURE_SORT_BIG
158 struct sort_key *key; 158 struct sort_key *key;
159 159
160 for(key=key_list;!retval && key;key=key->next_key) { 160 for(key=key_list;!retval && key;key=key->next_key) {
@@ -178,7 +178,7 @@ static int compare_keys(const void *xarg, const void *yarg)
178 case 0: 178 case 0:
179 retval=strcmp(x,y); 179 retval=strcmp(x,y);
180 break; 180 break;
181#ifdef CONFIG_SORT_BIG 181#ifdef CONFIG_FEATURE_SORT_BIG
182 case FLAG_g: 182 case FLAG_g:
183 { 183 {
184 char *xx,*yy; 184 char *xx,*yy;
@@ -232,6 +232,7 @@ static int compare_keys(const void *xarg, const void *yarg)
232 /* Perform fallback sort if necessary */ 232 /* Perform fallback sort if necessary */
233 if(!retval && !(global_flags&FLAG_s)) 233 if(!retval && !(global_flags&FLAG_s))
234 retval=strcmp(*(char **)xarg, *(char **)yarg); 234 retval=strcmp(*(char **)xarg, *(char **)yarg);
235//dprintf(2,"reverse=%d\n",flags&FLAG_r);
235 return ((flags&FLAG_r)?-1:1)*retval; 236 return ((flags&FLAG_r)?-1:1)*retval;
236} 237}
237 238
@@ -248,7 +249,7 @@ int sort_main(int argc, char **argv)
248 line=index(optlist,c); 249 line=index(optlist,c);
249 if(!line) bb_show_usage(); 250 if(!line) bb_show_usage();
250 switch(*line) { 251 switch(*line) {
251#ifdef CONFIG_SORT_BIG 252#ifdef CONFIG_FEATURE_SORT_BIG
252 case 'o': 253 case 'o':
253 if(outfile) bb_error_msg_and_die("Too many -o."); 254 if(outfile) bb_error_msg_and_die("Too many -o.");
254 outfile=bb_xfopen(optarg,"w"); 255 outfile=bb_xfopen(optarg,"w");
@@ -308,7 +309,7 @@ int sort_main(int argc, char **argv)
308 } 309 }
309 fclose(fp); 310 fclose(fp);
310 } 311 }
311#ifdef CONFIG_SORT_BIG 312#ifdef CONFIG_FEATURE_SORT_BIG
312 /* if no key, perform alphabetic sort */ 313 /* if no key, perform alphabetic sort */
313 if(!key_list) add_key()->range[0]=1; 314 if(!key_list) add_key()->range[0]=1;
314 /* handle -c */ 315 /* handle -c */