src/usr.bin/sort/sort.c - diff

Return to sort.c CVS log

Up to [local] / src / usr.bin / sort

Diff for /src/usr.bin/sort/sort.c between version 1.78 and 1.79

version 1.78, 2015/04/05 13:54:06

version 1.79, 2015/04/05 13:56:04

Line 913

sort_opts_vals.complex_sort = true;

sort_opts_vals.kflag = true;

keys_num++;

keys = sort_reallocarray(keys, keys_num + 1,

keys = sort_reallocarray(keys, keys_num,

sizeof(struct key_specs));

memset(&(keys[keys_num - 1]), 0,

memset(&(keys[keys_num]), 0,

sizeof(struct key_specs));

#ifndef GNUSORT_COMPATIBILITY

keys[keys_num].pos1b = default_sort_mods->bflag;

keys[keys_num].pos2b = default_sort_mods->bflag;

#endif

if (parse_k(optarg, &(keys[keys_num - 1])) < 0)

if (parse_k(optarg, &(keys[keys_num++])) < 0)

errc(2, EINVAL, "-k %s", optarg);

break;

Line 1064

Line 1067

keys = sort_reallocarray(keys, 1, sizeof(struct key_specs));

memset(&(keys[0]), 0, sizeof(struct key_specs));

keys[0].c1 = 1;

keys[0].pos1b = default_sort_mods->bflag;

#ifdef GNUSORT_COMPATIBILITY

keys[0].pos2b = default_sort_mods->bflag;

keys[0].pos1b = sm->bflag;

memcpy(&(keys[0].sm), default_sort_mods,

keys[0].pos2b = sm->bflag;

sizeof(struct sort_mods));

#endif

memcpy(&(keys[0].sm), sm, sizeof(struct sort_mods));

}

for (i = 0; i < keys_num; i++) {

Line 1077

Line 1081

if (sort_modifier_empty(&(ks->sm)) && !(ks->pos1b) &&

!(ks->pos2b)) {

#ifdef GNUSORT_COMPATIBILITY

ks->pos1b = sm->bflag;

ks->pos2b = sm->bflag;

#endif

memcpy(&(ks->sm), sm, sizeof(struct sort_mods));

}