Merge more cosmetical changes from NetBSD's libedit.
makelist: change tr '[a-z]' '[A-Z]' to tr '[:lower:]' '[:upper:]' so that POSIX systems work proerly regardsless of environment variable settings. tokenizer.c: pass lint on _LP64 Obtained from: NetBSD MFC after: 2 weeks
This commit is contained in:
parent
83b22b05e6
commit
8df73d0824
@ -1,5 +1,5 @@
|
||||
#!/bin/sh -
|
||||
# $NetBSD: makelist,v 1.10 2005/08/08 14:04:49 christos Exp $
|
||||
# $NetBSD: makelist,v 1.11 2005/10/22 16:45:03 christos Exp $
|
||||
# $FreeBSD$
|
||||
#
|
||||
# Copyright (c) 1992, 1993
|
||||
@ -141,7 +141,7 @@ case $FLAG in
|
||||
#
|
||||
-fh)
|
||||
cat $FILES | $AWK '/el_action_t/ { print $3 }' | \
|
||||
sort | LC_ALL=C tr 'a-z' 'A-Z' | $AWK '
|
||||
sort | LC_ALL=C tr '[:lower:]' '[:upper:]' | $AWK '
|
||||
BEGIN {
|
||||
printf("/* Automatically generated file, do not edit */\n");
|
||||
printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n");
|
||||
|
@ -29,7 +29,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $NetBSD: tokenizer.c,v 1.14 2003/12/05 13:37:48 lukem Exp $
|
||||
* $NetBSD: tokenizer.c,v 1.15 2009/02/15 21:55:23 christos Exp $
|
||||
*/
|
||||
|
||||
#if !defined(lint) && !defined(SCCSID)
|
||||
@ -198,7 +198,7 @@ tok_line(Tokenizer *tok, const LineInfo *line,
|
||||
ptr = "";
|
||||
if (ptr == line->cursor) {
|
||||
cc = tok->argc;
|
||||
co = tok->wptr - tok->wstart;
|
||||
co = (int)(tok->wptr - tok->wstart);
|
||||
}
|
||||
switch (*ptr) {
|
||||
case '\'':
|
||||
@ -417,7 +417,7 @@ tok_line(Tokenizer *tok, const LineInfo *line,
|
||||
tok_line_outok:
|
||||
if (cc == -1 && co == -1) {
|
||||
cc = tok->argc;
|
||||
co = tok->wptr - tok->wstart;
|
||||
co = (int)(tok->wptr - tok->wstart);
|
||||
}
|
||||
if (cursorc != NULL)
|
||||
*cursorc = cc;
|
||||
|
Loading…
x
Reference in New Issue
Block a user