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

Fix a long vs. int problem that was fatal on i386s with 64bit longs (but

Browse Source 
not alphas with 64bit longs).

Submitted by:	bde (a while ago)
This commit is contained in:
Tim Vanderhoek 2000-05-02 02:36:03 +00:00
parent 10ae1068e5
commit c9644b462f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.bin/more/ncommand.c
View File

@ -69,7 +69,9 @@ static const char rcsid[] =
#include "less.h" #include "less.h"
#include "pathnames.h" #include "pathnames.h"
static getint(), getstr_free(); static int getint __P((long *numb, const char **line));
static getstr_free();
static void **getstr_raisectxt(); static void **getstr_raisectxt();
/* The internal command table. */ /* The internal command table. */
@ -250,7 +252,7 @@ void **getstr_curctxt = getstr_ctxts;
*/ */
static char * static char *
getstr(line) getstr(line)
char **line; /* Where to look for the return string */ const char **line; /* Where to look for the return string */
{ {
int doquotes = 0; /* Doing a double-quote string */ int doquotes = 0; /* Doing a double-quote string */
char *retr; char *retr;
@ -265,7 +267,7 @@ getstr(line)
if (**line == '\'') { if (**line == '\'') {
/* Read until closing quote or '\0'. */ /* Read until closing quote or '\0'. */
char *nextw = retr = malloc(1); char *nextw = retr = malloc(1);
char *c = ++(*line); const char *c = ++(*line);
int l; int l;
for (; *c; c++) { for (; *c; c++) {
if (*c == '\'') { if (*c == '\'') {
@ -300,11 +302,11 @@ getstr(line)
if (**line == '(') { if (**line == '(') {
/* An arithmetic expression instead of a string... Well, I /* An arithmetic expression instead of a string... Well, I
* guess this is valid. See comment leading this function. */ * guess this is valid. See comment leading this function. */
int n; long n;
if (getint(&n, line)) if (getint(&n, line))
return NULL; return NULL;
retr = NULL; retr = NULL;
asprintf(&retr, "%d", n); asprintf(&retr, "%ld", n);
if (!retr) if (!retr)
SETERR (E_MALLOC); SETERR (E_MALLOC);
*getstr_curctxt = retr; *getstr_curctxt = retr;
@ -427,11 +429,12 @@ getstr_free(context)
static int static int
getint(numb, line) getint(numb, line)
long *numb; /* The read-in number is returned through this */ long *numb; /* The read-in number is returned through this */
char **line; /* The command line from which to read numb */ const char **line; /* The command line from which to read numb */
{ {
long n; long n;
int j; int j;
char *p, *t; char *p;
const char *t;
while (isspace(**line)) (*line)++; while (isspace(**line)) (*line)++;
@ -1030,7 +1033,7 @@ cflush(cident, args)
static const char * static const char *
cscroll(cident, args) cscroll(cident, args)
enum cident cident; enum cident cident;
char *args; const char *args;
{ {
long n; long n;
char *retr; char *retr;