mirrors
/
wmii
mirror of https://github.com/0intro/wmii
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a bunch of issues.

This commit is contained in:
Kris Maglione 2007-07-01 15:26:14 -04:00
parent 209fb08f82
commit ea557c9338
6 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/util.c
View File

@ -15,7 +15,7 @@ Vfmt(Fmt *f) {
va_list ap; va_list ap;
fmt = va_arg(f->args, char*); fmt = va_arg(f->args, char*);
ap = va_arg(f->args, va_list); va_copy(ap, va_arg(f->args, va_list));
return fmtvprint(f, fmt, ap); return fmtvprint(f, fmt, ap);
} }

2
cmd/wmii/message.c
View File

@ -270,7 +270,7 @@ parse_colors(IxpMsg *m, CTuple *col) {
if(*p++ != '#') if(*p++ != '#')
return Ebad; return Ebad;
for(j = 0; j < 6 && p < (char*)m->end; j++) for(j = 0; j < 6 && p < (char*)m->end; j++)
if(!ishexnumber(*p++)) if(!isxdigit(*p++))
return Ebad; return Ebad;
chartorune(&r, p); chartorune(&r, p);
if(i < 2 && r != ' ' || !(isspacerune(r) || *p == '\0')) if(i < 2 && r != ' ' || !(isspacerune(r) || *p == '\0'))

9
cmd/wmii/utf.h
View File

@ -1,9 +0,0 @@
typedef ushort Rune; /* 16 bits */
enum
{
UTFmax = 3, /* maximum bytes per rune */
Runesync = 0x80, /* cannot represent part of a UTF sequence (<) */
Runeself = 0x80, /* rune and UTF sequences are the same (<) */
Runeerror = 0xFFFD, /* decoding error in UTF */
};

6
mk/lib.mk
View File

@ -18,8 +18,8 @@ printinstall:
echo ' Lib: ${LIBDIR}' echo ' Lib: ${LIBDIR}'
${LIB}: ${OFILES} ${LIB}: ${OFILES}
@echo AR $$($(ROOT)/util/cleanname $(BASE)/$@) echo AR $$($(ROOT)/util/cleanname $(BASE)/$@)
@${AR} $@ ${OFILES} mkdir ${ROOT}/lib 2>/dev/null || true
@${RANLIB} $@ ${AR} $@ ${OFILES}
include ${ROOT}/mk/common.mk include ${ROOT}/mk/common.mk

21
util/cleanname
View File

@ -1,13 +1,18 @@
#!/bin/sh -f #!/bin/sh -f
echo "$@" | echo "$@" |
awk '{ awk -F'/+' '{
gsub(/\/+/, "/") delete a
while(gsub("[^/]+/\.\.(/|$)", "")) n = 0
; for(i = 1; i <= NF; i++) {
while(gsub("/\.(/|$)", "/")) if($i == ".." && n > 0 && a[n] != "..")
; n--
gsub(/\/+/, "/") else if($i != "" && $i != ".")
print a[++n] = $i
}
s = ""
for(i = 1; i <= n; i++)
s = s "/" a[i]
print substr(s, 2)
}' }'

5
util/compile
View File

@ -11,9 +11,10 @@ echo CC $($bin/cleanname ${BASE}$outfile)
$CC -o $outfile $CFLAGS $@ 2>$xtmp $CC -o $outfile $CFLAGS $@ 2>$xtmp
status=$? status=$?
base=$(echo $BASE | sed 's/,/\\,/g') base=$(echo $BASE | sed 's/,/\\,/g; s,/$,,')
re='\([^[:space:]/]*\..:[0-9]\)'
cat $xtmp | sed "s,^[^/][^:]*\.c:,$base&,g" | cat $xtmp | sed "s,^$re,$base/&,g; s,\([[:space:]]\)$re,\1$base/\2,g" |
egrep -v ': error: .Each undeclared identifier|: error: for each function it appears|is dangerous, better use|is almost always misused|: In function |: At top level:|support .long long.|use of C99 long long|ISO C forbids conversion' | egrep -v ': error: .Each undeclared identifier|: error: for each function it appears|is dangerous, better use|is almost always misused|: In function |: At top level:|support .long long.|use of C99 long long|ISO C forbids conversion' |
sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' | sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' |
uniq 1>&2 uniq 1>&2