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

Merge more cosmetical changes from NetBSD's libedit.

Browse Source 
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:
Pedro F. Giffuni 2012-07-19 19:15:47 +00:00
parent 83b22b05e6
commit 8df73d0824
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libedit/makelist
View File

@ -1,5 +1,5 @@
#!/bin/sh - #!/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$ # $FreeBSD$
# #
# Copyright (c) 1992, 1993 # Copyright (c) 1992, 1993
@ -141,7 +141,7 @@ case $FLAG in
# #
-fh) -fh)
cat $FILES | $AWK '/el_action_t/ { print $3 }' | \ 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 { BEGIN {
printf("/* Automatically generated file, do not edit */\n"); printf("/* Automatically generated file, do not edit */\n");
printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n"); printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n");

6
lib/libedit/tokenizer.c
View File

@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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) #if !defined(lint) && !defined(SCCSID)
@ -198,7 +198,7 @@ tok_line(Tokenizer *tok, const LineInfo *line,
ptr = ""; ptr = "";
if (ptr == line->cursor) { if (ptr == line->cursor) {
cc = tok->argc; cc = tok->argc;
co = tok->wptr - tok->wstart; co = (int)(tok->wptr - tok->wstart);
} }
switch (*ptr) { switch (*ptr) {
case '\'': case '\'':
@ -417,7 +417,7 @@ tok_line(Tokenizer *tok, const LineInfo *line,
tok_line_outok: tok_line_outok:
if (cc == -1 && co == -1) { if (cc == -1 && co == -1) {
cc = tok->argc; cc = tok->argc;
co = tok->wptr - tok->wstart; co = (int)(tok->wptr - tok->wstart);
} }
if (cursorc != NULL) if (cursorc != NULL)
*cursorc = cc; *cursorc = cc;