Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)

Browse Source 
- Fix for possible unset uid/gid in toproto
 - Fix for default mtree style
 - Update libelf
 - Importing libexecinfo
 - Resynchronize GCC, mpc, gmp, mpfr
 - build.sh: Replace params with show-params.
     This has been done as the make target has been renamed in the same
     way, while a new target named params has been added. This new
     target generates a file containing all the parameters, instead of
     printing it on the console.
 - Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
     get getservbyport() out of the inner loop

Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091
This commit is contained in:
sambuc
2014-07-28 17:05:06 +02:00
parent ff10274392
commit 84d9c625bf
4655 changed files with 379308 additions and 151050 deletions
Download Patch File Download Diff File Expand all files Collapse all files
usr.bin/sort/fields.c
+11 -8
View File
@@ -1,4 +1,4 @@
/* $NetBSD: fields.c,v 1.32 2010/12/18 23:09:48 christos Exp $ */
/* $NetBSD: fields.c,v 1.33 2013/01/20 10:12:58 apb Exp $ */
/*-
* Copyright (c) 2000-2003 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#include "sort.h"
__RCSID("$NetBSD: fields.c,v 1.32 2010/12/18 23:09:48 christos Exp $");
__RCSID("$NetBSD: fields.c,v 1.33 2013/01/20 10:12:58 apb Exp $");
#define SKIP_BLANKS(ptr) { \
if (BLANK & d_mask[*(ptr)]) \
@@ -82,9 +82,9 @@ static u_char *enterfield(u_char *, const u_char *, struct field *, int);
static u_char *number(u_char *, const u_char *, u_char *, u_char *, int);
static u_char *length(u_char *, const u_char *, u_char *, u_char *, int);
#ifdef __minix
#if defined(__minix)
static u_char *numhex(u_char *, const u_char *, u_char *, u_char *, int);
#endif
#endif /* defined(__minix) */
#define DECIMAL_POINT '.'
@@ -209,10 +209,10 @@ enterfield(u_char *tablepos, const u_char *endkey, struct field *cur_fld,
return length(tablepos, endkey, start, end, flags);
if (flags & N)
return number(tablepos, endkey, start, end, flags);
#ifdef __minix
#if defined(__minix)
if (flags & X)
return numhex(tablepos, endkey, start, end, flags);
#endif
#endif /* defined(__minix) */
/* Bound check space - assuming nothing is skipped */
if (tablepos + (end - start) + 1 >= endkey)
@@ -283,7 +283,10 @@ number(u_char *pos, const u_char *bufend, u_char *line, u_char *lineend,
if (*line == '-') { /* set the sign */
negate ^= 0xff;
line++;
} else if (*line == '+') {
line++;
}
/* eat initial zeroes */
for (; *line == '0' && line < lineend; line++)
continue;
@@ -384,7 +387,7 @@ length(u_char *pos, const u_char *bufend, u_char *line, u_char *lineend,
return number(pos, bufend, buf, buf + l, flag);
}
#ifdef __minix
#if defined(__minix)
static u_char *
numhex(u_char *pos, const u_char *bufend, u_char *line, u_char *lineend,
int flag)
@@ -397,4 +400,4 @@ numhex(u_char *pos, const u_char *bufend, u_char *line, u_char *lineend,
l = snprintf((char *)buf, sizeof(buf), "%lld", n);
return number(pos, bufend, buf, buf + l, flag);
}
#endif
#endif /* defined(__minix) */