Use IXP_ASSERT_VERSION macro.

This commit is contained in:
Kris Maglione 2010-06-17 18:23:25 -04:00
parent f45311261e
commit b223b27f70
5 changed files with 14 additions and 2 deletions

5
FAQ
View File

@ -69,7 +69,10 @@ Your terminal has asked to only be resized in certain increments,
and there's not enough space for another row. `wmii` is forced to and there's not enough space for another row. `wmii` is forced to
compromise and leave blank space around it. If you'd rather wmii to compromise and leave blank space around it. If you'd rather wmii to
ignore the terminal's request, write 'incmode ignore'[5] to the /ctl ignore the terminal's request, write 'incmode ignore'[5] to the /ctl
virtual file. virtual file. Note, though, that this will prevent `wmii`'s normal
behavior of trying to keep these increment gaps as small as
possible, and will therefore result in more wasted space than
otherwise.
10. On FreeBSD, using p9p[6], I get an error about not being able to open /dev/fd/7. 10. On FreeBSD, using p9p[6], I get an error about not being able to open /dev/fd/7.
------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------

View File

@ -334,6 +334,8 @@ main(int argc, char *argv[]) {
char *wmiirc; char *wmiirc;
int i; int i;
IXP_ASSERT_VERSION;
setlocale(LC_CTYPE, ""); setlocale(LC_CTYPE, "");
fmtinstall('r', errfmt); fmtinstall('r', errfmt);
fmtinstall('a', afmt); fmtinstall('a', afmt);

View File

@ -515,6 +515,8 @@ main(int argc, char *argv[]) {
exectab *tab; exectab *tab;
int ret; int ret;
IXP_ASSERT_VERSION;
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
binary = utf8locale(); binary = utf8locale();

View File

@ -15,7 +15,7 @@ static int nkeys;
static void static void
usage(void) { usage(void) {
fprint(2, "usage: wikeyname\n"); lprint(2, "usage: wikeyname\n");
exit(1); exit(1);
} }
@ -25,6 +25,9 @@ main(int argc, char *argv[]) {
setlocale(LC_CTYPE, ""); setlocale(LC_CTYPE, "");
ARGBEGIN{ ARGBEGIN{
case 'v':
lprint(2, version);
return 0;
default: usage(); default: usage();
}ARGEND; }ARGEND;

View File

@ -44,6 +44,8 @@ readctl(char *key) {
void void
client_init(char* address) { client_init(char* address) {
IXP_ASSERT_VERSION;
if(address == nil) if(address == nil)
address = getenv("WMII_ADDRESS"); address = getenv("WMII_ADDRESS");
if(address && *address) if(address && *address)