Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixit() needs to know the getopt options list to do its thing correctly.

Browse Source
This commit is contained in:
dholland 2010-06-05 17:44:51 +00:00
parent 7b26e5d94f
commit 8696c1b71e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: sort.c,v 1.58 2010/02/05 21:58:42 enami Exp $ */
/* $NetBSD: sort.c,v 1.59 2010/06/05 17:44:51 dholland Exp $ */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@ -76,7 +76,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
The Regents of the University of California. All rights reserved.");
#endif /* not lint */
__RCSID("$NetBSD: sort.c,v 1.58 2010/02/05 21:58:42 enami Exp $");
__RCSID("$NetBSD: sort.c,v 1.59 2010/06/05 17:44:51 dholland Exp $");
#include <sys/types.h>
#include <sys/time.h>
@ -147,13 +147,15 @@ main(int argc, char *argv[])
fldtab = emalloc(fldtab_sz * sizeof(*fldtab));
memset(fldtab, 0, fldtab_sz * sizeof(*fldtab));
#define SORT_OPTS "bcdD:fik:mHno:rR:sSt:T:ux"
/* Convert "+field" args to -f format */
fixit(&argc, argv);
fixit(&argc, argv, SORT_OPTS);
if (!(tmpdir = getenv("TMPDIR")))
tmpdir = _PATH_TMP;
while ((ch = getopt(argc, argv, "bcdD:fik:mHno:rR:sSt:T:ux")) != -1) {
while ((ch = getopt(argc, argv, SORT_OPTS)) != -1) {
switch (ch) {
case 'b':
fldtab[0].flags |= BI | BT;

4
usr.bin/sort/sort.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: sort.h,v 1.31 2010/02/05 21:58:42 enami Exp $ */
/* $NetBSD: sort.h,v 1.32 2010/06/05 17:44:51 dholland Exp $ */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@ -178,7 +178,7 @@ RECHEADER *allocrec(RECHEADER *, size_t);
void append(RECHEADER **, int, FILE *, void (*)(const RECHEADER *, FILE *));
void concat(FILE *, FILE *);
length_t enterkey(RECHEADER *, const u_char *, u_char *, size_t, struct field *);
void fixit(int *, char **);
void fixit(int *, char **, const char *);
void fldreset(struct field *);
FILE *ftmp(void);
void fmerge(struct filelist *, int, FILE *, struct field *);