d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sort(1): Whitespace and style cleanup

Browse Source 
No functional change.

Sponsored by:	Dell EMC Isilon
This commit is contained in:
Conrad Meyer 2019-04-11 00:39:06 +00:00
parent 745598d472
commit 74504eefa1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=346110
1 changed files with 89 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
usr.bin/sort/sort.c
View File

@ -566,55 +566,57 @@ static bool
set_sort_modifier(struct sort_mods *sm, int c) set_sort_modifier(struct sort_mods *sm, int c)
{ {
if (sm) { if (sm == NULL)
switch (c){ return (true);
case 'b':
sm->bflag = true; switch (c){
break; case 'b':
case 'd': sm->bflag = true;
sm->dflag = true; break;
break; case 'd':
case 'f': sm->dflag = true;
sm->fflag = true; break;
break; case 'f':
case 'g': sm->fflag = true;
sm->gflag = true; break;
need_hint = true; case 'g':
break; sm->gflag = true;
case 'i': need_hint = true;
sm->iflag = true; break;
break; case 'i':
case 'R': sm->iflag = true;
sm->Rflag = true; break;
need_random = true; case 'R':
break; sm->Rflag = true;
case 'M': need_random = true;
initialise_months(); break;
sm->Mflag = true; case 'M':
need_hint = true; initialise_months();
break; sm->Mflag = true;
case 'n': need_hint = true;
sm->nflag = true; break;
need_hint = true; case 'n':
print_symbols_on_debug = true; sm->nflag = true;
break; need_hint = true;
case 'r': print_symbols_on_debug = true;
sm->rflag = true; break;
break; case 'r':
case 'V': sm->rflag = true;
sm->Vflag = true; break;
break; case 'V':
case 'h': sm->Vflag = true;
sm->hflag = true; break;
need_hint = true; case 'h':
print_symbols_on_debug = true; sm->hflag = true;
break; need_hint = true;
default: print_symbols_on_debug = true;
return false; break;
} default:
sort_opts_vals.complex_sort = true; return (false);
sm->func = get_sort_func(sm);
} }
sort_opts_vals.complex_sort = true;
sm->func = get_sort_func(sm);
return (true); return (true);
} }
@ -910,53 +912,49 @@ fix_obsolete_keys(int *argc, char **argv)
static void static void
set_random_seed(void) set_random_seed(void)
{ {
if (need_random) { if (strcmp(random_source, DEFAULT_RANDOM_SORT_SEED_FILE) == 0) {
FILE* fseed;
MD5_CTX ctx;
char rsd[MAX_DEFAULT_RANDOM_SEED_DATA_SIZE];
size_t sz = 0;
if (strcmp(random_source, DEFAULT_RANDOM_SORT_SEED_FILE) == 0) { fseed = openfile(random_source, "r");
FILE* fseed; while (!feof(fseed)) {
MD5_CTX ctx; int cr;
char rsd[MAX_DEFAULT_RANDOM_SEED_DATA_SIZE];
size_t sz = 0;
fseed = openfile(random_source, "r"); cr = fgetc(fseed);
while (!feof(fseed)) { if (cr == EOF)
int cr; break;
cr = fgetc(fseed); rsd[sz++] = (char) cr;
if (cr == EOF)
break;
rsd[sz++] = (char) cr; if (sz >= MAX_DEFAULT_RANDOM_SEED_DATA_SIZE)
break;
if (sz >= MAX_DEFAULT_RANDOM_SEED_DATA_SIZE)
break;
}
closefile(fseed, random_source);
MD5Init(&ctx);
MD5Update(&ctx, rsd, sz);
random_seed = MD5End(&ctx, NULL);
random_seed_size = strlen(random_seed);
} else {
MD5_CTX ctx;
char *b;
MD5Init(&ctx);
b = MD5File(random_source, NULL);
if (b == NULL)
err(2, NULL);
random_seed = b;
random_seed_size = strlen(b);
} }
MD5Init(&md5_ctx); closefile(fseed, random_source);
if(random_seed_size>0) {
MD5Update(&md5_ctx, random_seed, random_seed_size); MD5Init(&ctx);
} MD5Update(&ctx, rsd, sz);
random_seed = MD5End(&ctx, NULL);
random_seed_size = strlen(random_seed);
} else {
MD5_CTX ctx;
char *b;
MD5Init(&ctx);
b = MD5File(random_source, NULL);
if (b == NULL)
err(2, NULL);
random_seed = b;
random_seed_size = strlen(b);
}
MD5Init(&md5_ctx);
if(random_seed_size>0) {
MD5Update(&md5_ctx, random_seed, random_seed_size);
} }
} }
@ -1226,7 +1224,8 @@ main(int argc, char **argv)
} }
} }
set_random_seed(); if (need_random)
set_random_seed();
/* Case when the outfile equals one of the input files: */ /* Case when the outfile equals one of the input files: */
if (strcmp(outfile, "-")) { if (strcmp(outfile, "-")) {