src/usr.bin/less/optfunc.c - diff

Return to optfunc.c CVS log

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

version 1.14, 2016/01/12 23:01:23

version 1.15, 2016/02/03 15:47:27

Line 435

extern int tabstops[];

extern int ntabstops;

extern int tabdefault;

char msg[60+(4*TABSTOP_MAX)];

char tabs[60+(4*TABSTOP_MAX)];

int i;

PARG p;

Line 460

tabdefault = tabstops[ntabstops-1] - tabstops[ntabstops-2];

break;

case QUERY:

(void) strlcpy(msg, "Tab stops ", sizeof(msg));

(void) strlcpy(tabs, "Tab stops ", sizeof(tabs));

if (ntabstops > 2) {

for (i = 1; i < ntabstops; i++) {

if (i > 1)

strlcat(msg, ",", sizeof(msg));

strlcat(tabs, ",", sizeof(tabs));

(void) snprintf(msg+strlen(msg),

(void) snprintf(tabs+strlen(tabs),

sizeof(msg)-strlen(msg), "%d", tabstops[i]);

sizeof(tabs)-strlen(tabs),

"%d", tabstops[i]);

}

(void) snprintf(msg+strlen(msg), sizeof(msg)-strlen(msg),

(void) snprintf(tabs+strlen(tabs),

" and then ");

sizeof(tabs)-strlen(tabs), " and then ");

}

(void) snprintf(msg+strlen(msg), sizeof(msg)-strlen(msg),

(void) snprintf(tabs+strlen(tabs), sizeof(tabs)-strlen(tabs),

"every %d spaces", tabdefault);

p.p_string = msg;

p.p_string = tabs;

error("%s", &p);

break;

}