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

Fix head -c ### where ### is greater than 2^31. Unlike the submitted

Browse Source 
patch this uses off_t.

WARNSify and add $FreeBSD$ to Makefile.

PR:		bin/107824
Submitted by:	Brian Cornell <briancornell at earthlink dot net>
MFC after:	3 days
This commit is contained in:
brooks 2007-01-11 17:03:51 +00:00
parent 3b33e7a4f8
commit fa97295521
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/head/Makefile
View File

@ -1,5 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
PROG= head
WARNS= 6
.include <bsd.prog.mk>

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

@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
#include <ctype.h>
#include <err.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -61,7 +62,7 @@ __FBSDID("$FreeBSD$");
*/
static void head(FILE *, int);
static void head_bytes(FILE *, size_t);
static void head_bytes(FILE *, off_t);
static void obsolete(char *[]);
static void usage(void);
@ -70,14 +71,15 @@ main(int argc, char *argv[])
{
int ch;
FILE *fp;
int first, linecnt = -1, bytecnt = -1, eval = 0;
int first, linecnt = -1, eval = 0;
off_t bytecnt = -1;
char *ep;
obsolete(argv);
while ((ch = getopt(argc, argv, "n:c:")) != -1)
switch(ch) {
case 'c':
bytecnt = strtol(optarg, &ep, 10);
bytecnt = strtoimax(optarg, &ep, 10);
if (*ep || bytecnt <= 0)
errx(1, "illegal byte count -- %s", optarg);
break;
@ -138,7 +140,7 @@ head(FILE *fp, int cnt)
}
static void
head_bytes(FILE *fp, size_t cnt)
head_bytes(FILE *fp, off_t cnt)
{
char buf[4096];
size_t readlen;