commit 93aa9a876da1c1a05183bb87bf2c231256c38139
parent c2c06670d5676331635e07e12731b6af2bba868c
Author: Kris Maglione <jg@suckless.org>
Date: Fri, 8 Jun 2007 12:35:19 -0400
Fixed typo in welcome message, thanks to turjo. Made util/compile tack the path onto files in error messages. Minor changes.
Diffstat:
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cmd/wmii/message.c b/cmd/wmii/message.c
@@ -130,9 +130,8 @@ getword(Message *m) {
#define strbcmp(str, const) (strncmp((str), (const), sizeof(const)-1))
static int
getbase(char **s) {
- char base[3];
char *p;
-
+
p = *s;
if(!strbcmp(p, "0x")) {
*s += 2;
@@ -144,8 +143,7 @@ getbase(char **s) {
}
if(isdigit(p[0]) && isdigit(p[1]) && p[2] == 'r') {
*s += 3;
- strncpy(base, p, sizeof base);
- return atoi(base);
+ return 10*(p[0]-'0') + (p[1]-'0');
}
if(!strbcmp(p, "0")) {
*s += 1;
diff --git a/rc/rc.wmii.rc b/rc/rc.wmii.rc
@@ -165,7 +165,7 @@ fn Key-$MODKEY-m { wmiir xwrite /tag/sel/ctl colmode sel max }
fn Key-$MODKEY-Shift-c { wmiir xwrite /client/sel/ctl kill }
fn Key-$MODKEY-a { Action `{actionlist | wmiimenu} & }
-fn Key-$MODKEY-p { run_command `{wmiimenu <$progs_file} & }
+fn Key-$MODKEY-p { ifs=() { run_command `{wmiimenu <$progs_file} & } }
fn Key-$MODKEY-Return { run_command $WMII_TERM & }
fn Key-$MODKEY-t { wmiir xwrite /ctl view `{read_tags | wmiimenu} & }
fn Key-$MODKEY-Shift-t {
diff --git a/rc/welcome.sh b/rc/welcome.sh
@@ -9,7 +9,7 @@ little bit familiar with wmii.
From here on, keypresses will be described such that M-a refers to
pressing $MODKEY and a at the same time. $MODKEY refers to a
-configuratin variable which contains the Alt key by default.
+configuration variable which contains the Alt key by default.
Let's go!
diff --git a/util/compile b/util/compile
@@ -10,7 +10,9 @@ echo CC ${BASE}$outfile
$CC -o $outfile $CFLAGS $@ 2>$xtmp
status=$?
-cat $xtmp |
+base=$(echo $BASE | sed 's/,/\\,/g')
+
+cat $xtmp | sed "s,^[^/][^:]*\.c:,$base&,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' |
sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' |
uniq 1>&2
