commit 7475073c47d92b40ff6475ef52d825a6869d1f20
parent f53b8d61ef0065d23509b47e6671aefa2eec40ad
Author: garbeam <garbeam@mmv.wmii.de>
Date: Mon, 12 Dec 2005 16:16:23 +0200
fixed occurences of various old-style named commands in man pages and source
Diffstat:
15 files changed, 137 insertions(+), 137 deletions(-)
diff --git a/cmd/wm/wmii b/cmd/wm/wmii
@@ -13,7 +13,7 @@ WMII_CONFDIR=CONFPREFIX/wmii-3
OLD_PATH=$PATH
PATH=$HOME/.wmii-3:$WMII_CONFDIR:9PREFIX/bin:$PATH
WMII_IDENT=`{date -n}^'-'^$pid
-WMIR_SOCKET=/tmp/.ixp-$USER/wmifs-$WMII_IDENT
+WMIR_SOCKET=/tmp/.ixp-$USER/wmiifs-$WMII_IDENT
# start window manager and utilities:
mkdir -p /tmp/.ixp-$USER
diff --git a/cmd/wm/wmii.1 b/cmd/wm/wmii.1
@@ -34,12 +34,12 @@ periodically print date and load average to the bar
welcome
display a welcome message that contains the wmii tutorial
.TP 2
-wmirc
+wmiirc
configure wmii
.SS Configuration
If you feel the need to change the default configuration, then customize (as
described above) the
-.B wmirc
+.B wmiirc
action. This action is executed at the end of the
.BR wmii (1)
script and does all the work of setting up the window manager, the key
@@ -70,7 +70,7 @@ PATH as it was before
.BR wmii (1)
added the local and global action directory and the location where the 9base
tools reside. The
-.B wmire
+.B wmiire
action resets PATH and removes OLD_PATH before executing a command.
.TP
WMII_CONFDIR
@@ -83,13 +83,13 @@ session. Part of the socket file names.
.TP
WMIR_SOCKET
Socket file of
-.BR wmifs (1).
+.BR wmiifs (1).
Used by
-.BR wmir (1).
+.BR wmiir (1).
.SH SEE ALSO
-.BR wmibar (1),
-.BR wmifs (1),
+.BR wmiibar (1),
+.BR wmiifs (1),
.BR wmiiwm (1),
-.BR wmikeys (1),
-.BR wmimenu (1),
-.BR wmir (1)
+.BR wmiikeys (1),
+.BR wmiimenu (1),
+.BR wmiir (1)
diff --git a/cmd/wm/wmiiwm.1 b/cmd/wm/wmiiwm.1
@@ -19,12 +19,12 @@ operating system and can be found in the Acme programming environment.
.B wmii
consists of the core window manager itself and several utilities, such
as
-.BR wmibar (1),
-.BR wmifs (1),
-.BR wmimenu (1),
-.BR wmikeys (1),
+.BR wmiibar (1),
+.BR wmiifs (1),
+.BR wmiimenu (1),
+.BR wmiikeys (1),
.BR wmiplumb (1),
-.BR wmir (1)
+.BR wmiir (1)
and
.BR wmiwarp (1).
@@ -133,7 +133,7 @@ frame or launching a terminal.
is customized through the rc script, which manipulates the namespace its
fileserver provides to other processes. This namespace can be accessed
using the
-.BR wmir (1)
+.BR wmiir (1)
utility. The default rc script uses this utility to setup wmii and its
components.
.P
@@ -143,13 +143,13 @@ process, like
.B wmii.
Such
namespaces can be bound (mounted) to userdefined namespaces using the
-.BR wmifs (1)
+.BR wmiifs (1)
utility. In the default rc script the namespace provided by wmii, is
bound to
.FN /wmii
.P
There are four actions provided by the
-.BR wmir (1)
+.BR wmiir (1)
utility to manipulate your namespace:
.BR create ,
.BR remove ,
@@ -161,11 +161,11 @@ and
.SH AUTHOR
Copyright \(co 2003 - 2005 by Anselm R. Garbe <garbeam (at) gmail (dot) com>
.SH SEE ALSO
-.BR wmibar (1),
-.BR wmifs (1),
-.BR wmimenu (1),
-.BR wmikeys (1),
+.BR wmiibar (1),
+.BR wmiifs (1),
+.BR wmiimenu (1),
+.BR wmiikeys (1),
.BR wmiplumb (1),
-.BR wmir (1),
+.BR wmiir (1),
.BR wmiwarp (1),
.BR wmii.rc (5).
diff --git a/cmd/wmiibar.1 b/cmd/wmiibar.1
@@ -1,43 +1,43 @@
.TH WMIBAR 1 wmii-3
.SH NAME
-wmibar \- window manager improved 2 bar
+wmiibar \- window manager improved 2 bar
.SH SYNOPSIS
-.B wmibar
+.B wmiibar
.B \-s
.I socketfile
.SH DESCRIPTION
.SS Overview
-.B wmibar
+.B wmiibar
is a generic and highly customizable bar for the X Window System,
originally designed for
.BR wmii (1).
It supports arbitrary sized labels with arbitrary styles on a per label
basis and with button click events.
Like wmii,
-.B wmibar
+.B wmiibar
also implements a socket-based fileserver, which is accessed to configure and
interoperate with other components.
.SS Options
.TP
.BI \-s " socketfile"
specifies the socketfile that
-.B wmibar
+.B wmiibar
should create.
.TP
.B \-v
prints version information to stderr, then exits.
.SS Customization
-.B wmibar
+.B wmiibar
is customized through manipulating its filesystem namespace.
In the default setup of
.BR wmii (1)
the namespace of
-.B wmibar
+.B wmiibar
can be found in /bar.
.SH SEE ALSO
-.BR wmifs (1),
+.BR wmiifs (1),
.BR wmii (1),
.BR wmiiwm (1),
-.BR wmikeys (1),
-.BR wmimenu (1),
-.BR wmir (1)
+.BR wmiikeys (1),
+.BR wmiimenu (1),
+.BR wmiir (1)
diff --git a/cmd/wmiibar.c b/cmd/wmiibar.c
@@ -69,14 +69,14 @@ static Action acttbl[] = {
};
static char *version[] = {
- "wmibar - window manager improved bar - " VERSION "\n"
+ "wmiibar - window manager improved bar - " VERSION "\n"
" (C)opyright MMIV-MMV Anselm R. Garbe\n", 0
};
static void usage()
{
fprintf(stderr, "%s",
- "usage: wmibar -s <socket file> [-v]\n"
+ "usage: wmiibar -s <socket file> [-v]\n"
" -s socket file\n" " -v version info\n");
exit(1);
}
@@ -471,7 +471,7 @@ int main(int argc, char *argv[])
dpy = XOpenDisplay(0);
if (!dpy) {
- fprintf(stderr, "%s", "wmibar: cannot open display\n");
+ fprintf(stderr, "%s", "wmiibar: cannot open display\n");
exit(1);
}
XSetErrorHandler(dummy_error_handler);
@@ -482,7 +482,7 @@ int main(int argc, char *argv[])
/* init */
if (!(file[B_CTL] = ixp_create(ixps, "/ctl"))) {
- perror("wmibar: cannot connect IXP server");
+ perror("wmiibar: cannot connect IXP server");
exit(1);
}
file[B_CTL]->after_write = handle_after_write;
diff --git a/cmd/wmiibar2.c b/cmd/wmiibar2.c
@@ -108,14 +108,14 @@ static Draw zero_draw = { 0 };
*/
static char *version[] = {
- "wmibar - window manager improved bar - " VERSION "\n"
+ "wmiibar - window manager improved bar - " VERSION "\n"
" (C)opyright MMIV-MMV Anselm R. Garbe\n", 0
};
static void usage()
{
fprintf(stderr, "%s %d",
- "usage: wmibar -s <socket file> [-v]\n"
+ "usage: wmiibar -s <socket file> [-v]\n"
" -s socket file\n" " -v version info\n",
NONE);
exit(1);
@@ -415,14 +415,14 @@ int main(int argc, char *argv[])
dpy = XOpenDisplay(0);
if (!dpy) {
- fprintf(stderr, "%s", "wmibar: cannot open display\n");
+ fprintf(stderr, "%s", "wmiibar: cannot open display\n");
exit(1);
}
XSetErrorHandler(dummy_error_handler);
screen_num = DefaultScreen(dpy);
if (!ixp_server_init(&srv, sockfile, funcs, freeconn)) {
- fprintf(stderr, "wmibar: fatal: %s\n", srv.errstr);
+ fprintf(stderr, "wmiibar: fatal: %s\n", srv.errstr);
exit(1);
}
root_qid.type = IXP_QTDIR;
@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
ixp_server_loop(&srv);
if (srv.errstr) {
- fprintf(stderr, "wmibar: fatal: %s\n", srv.errstr);
+ fprintf(stderr, "wmiibar: fatal: %s\n", srv.errstr);
ixp_server_deinit(&srv);
exit(1);
}
diff --git a/cmd/wmiifs.1 b/cmd/wmiifs.1
@@ -1,13 +1,13 @@
.TH WMIFS 1 wmii-3
.SH NAME
-wmifs \- window manager improved 2 filesystem
+wmiifs \- window manager improved 2 filesystem
.SH SYNOPSIS
-.B wmifs
+.B wmiifs
.B \-s
.I socketfile
.SH DESCRIPTION
.SS Overview
-.B wmifs
+.B wmiifs
is a socket-based fileserver which is used for binding other fileserver
filesystems to a specific namespace. It routes filesystem accesses to
the specific fileserver and behaves to the outside as one master
@@ -16,23 +16,23 @@ filesystem.
.TP
.BI \-s " socketfile"
specifies the socketfile that
-.B wmifs
+.B wmiifs
should create.
.TP
.B \-v
prints version information to stderr, then exits.
.SS Customization
-.B wmifs
+.B wmiifs
is customized through manipulating its filesystem namespace.
In the default setup of
.BR wmii (1)
the namespace of
-.B wmifs
+.B wmiifs
can be found in /.
.SH SEE ALSO
-.BR wmibar (1),
+.BR wmiibar (1),
.BR wmii (1),
.BR wmiiwm (1),
-.BR wmikeys (1),
-.BR wmimenu (1),
-.BR wmir (1)
+.BR wmiikeys (1),
+.BR wmiimenu (1),
+.BR wmiir (1)
diff --git a/cmd/wmiifs.c b/cmd/wmiifs.c
@@ -47,14 +47,14 @@ static Action acttbl[] = {
};
static char *version[] = {
- "wmifs - window manager improved filesystem - " VERSION "\n"
+ "wmiifs - window manager improved filesystem - " VERSION "\n"
" (C)opyright MMV Anselm R. Garbe\n", 0
};
static void usage()
{
fprintf(stderr,
- "usage: wmifs -s <socket file> [-v]\n"
+ "usage: wmiifs -s <socket file> [-v]\n"
" -s socket file\n" " -v version info\n");
exit(1);
}
@@ -66,7 +66,7 @@ static void iter_unbind(void *bind, void *aux)
b->mount->content = 0;
ixp_remove(ixps, b->prefix);
if (ixps->errstr)
- fprintf(stderr, "wmifs: error on unbind %s: %s\n", b->prefix, ixps->errstr);
+ fprintf(stderr, "wmiifs: error on unbind %s: %s\n", b->prefix, ixps->errstr);
}
}
@@ -97,7 +97,7 @@ static void unbind(void *obj, char *arg)
Bind *b = cext_find_item(&bindings, arg, comp_bindpath);
if (!b) {
- fprintf(stderr, "wmifs: unbind: '%s' no such path\n", arg);
+ fprintf(stderr, "wmiifs: unbind: '%s' no such path\n", arg);
return;
}
do_unbind(b);
@@ -114,20 +114,20 @@ static void bind(void *obj, char *arg)
cext_strlcpy(cmd, arg, sizeof(cmd));
sfile = strchr(cmd, ' ');
if (!sfile) {
- fprintf(stderr, "wmifs: bind: '%s' without socket argument, ignoring\n", arg);
+ fprintf(stderr, "wmiifs: bind: '%s' without socket argument, ignoring\n", arg);
return; /* shortcut with empty argument */
}
*sfile = 0;
sfile++;
if (*sfile == 0) {
- fprintf(stderr, "wmifs: bind: '%s' without socket argument, ignoring\n", arg);
+ fprintf(stderr, "wmiifs: bind: '%s' without socket argument, ignoring\n", arg);
return; /* shortcut with empty argument */
}
b = cext_emallocz(sizeof(Bind));
b->client = init_ixp_client(sfile);
if (!b->client) {
- fprintf(stderr, "wmifs: bind: cannot connect to server '%s', ignoring\n", sfile);
+ fprintf(stderr, "wmiifs: bind: cannot connect to server '%s', ignoring\n", sfile);
free(b);
return;
}
@@ -303,18 +303,18 @@ static void check_event(Connection * e)
XEvent ev;
while (XPending(dpy)) {
/*
- * wmifs isn't interested in any X events, so just drop them
+ * wmiifs isn't interested in any X events, so just drop them
* all
*/
XNextEvent(dpy, &ev);
}
- /* why check them? because X won't kill wmifs when X dies */
+ /* why check them? because X won't kill wmiifs when X dies */
}
static void run()
{
if (!(files[F_CTL] = ixp_create(ixps, "/ctl"))) {
- perror("wmifs: cannot connect IXP server");
+ perror("wmiifs: cannot connect IXP server");
exit(1);
}
files[F_CTL]->after_write = handle_after_write;
@@ -359,13 +359,13 @@ int main(int argc, char *argv[])
if (!getenv("HOME")) {
fprintf(stderr, "%s",
- "wmifs: $HOME environment variable is not set\n");
+ "wmiifs: $HOME environment variable is not set\n");
usage();
}
/* just for the case X crashes/gets quit */
dpy = XOpenDisplay(0);
if (!dpy) {
- fprintf(stderr, "%s", "wmifs: cannot open display\n");
+ fprintf(stderr, "%s", "wmiifs: cannot open display\n");
exit(1);
}
ixps = wmii_setup_server(sockfile);
diff --git a/cmd/wmiikeys.1 b/cmd/wmiikeys.1
@@ -1,13 +1,13 @@
.TH WMIKEYS 1 wmii-3
.SH NAME
-wmikeys \- window manager improved 2 keys
+wmiikeys \- window manager improved 2 keys
.SH SYNOPSIS
-.B wmikeys
+.B wmiikeys
.B \-s
.I socketfile
.SH DESCRIPTION
.SS Overview
-.B wmikeys
+.B wmiikeys
is a generic, highly customizable, and efficient key grabbing utility for the
X Window System, originally designed for
.BR wmii (1).
@@ -16,30 +16,30 @@ with equivalent features like the ratpoison keyboard control allows.
It supports arbitrary, user defined shortcuts which are bound to
arbitrary actions.
Like wmii,
-.B wmikeys
+.B wmiikeys
also implements a socket-based fileserver, which is accessed to configure and
interact with other components.
.SS Options
.TP
.BI \-s " socketfile"
specifies the socketfile that
-.B wmikeys
+.B wmiikeys
should create.
.TP
.B \-v
prints version information to stderr, then exits.
.SS Customization
-.B wmikeys
+.B wmiikeys
is customized through manipulating its filesystem namespace.
In the default setup of
.BR wmii (1)
the namespace of
-.B wmikeys
+.B wmiikeys
can be found in /keys.
.SH SEE ALSO
-.BR wmibar (1),
-.BR wmifs (1),
+.BR wmiibar (1),
+.BR wmiifs (1),
.BR wmii (1),
.BR wmiiwm (1),
-.BR wmimenu (1),
-.BR wmir (1)
+.BR wmiimenu (1),
+.BR wmiir (1)
diff --git a/cmd/wmiikeys.c b/cmd/wmiikeys.c
@@ -65,15 +65,15 @@ static Action acttbl[] = {
};
static char *version[] = {
- "wmikeys - window manager improved keys - " VERSION "\n"
+ "wmiikeys - window manager improved keys - " VERSION "\n"
" (C)opyright MMIV-MMV Anselm R. Garbe\n", 0
};
static void usage()
{
fprintf(stderr, "%s",
- "usage: wmikeys [-s <socket file>] [-v]\n"
- " -s socket file (default: /tmp/.ixp-$USER/wmikeys-$WMII_IDENT)\n"
+ "usage: wmiikeys [-s <socket file>] [-v]\n"
+ " -s socket file (default: /tmp/.ixp-$USER/wmiikeys-$WMII_IDENT)\n"
" -v version info\n");
exit(1);
}
@@ -419,7 +419,7 @@ int main(int argc, char *argv[])
dpy = XOpenDisplay(0);
if (!dpy) {
- fprintf(stderr, "%s", "wmikeys: cannot open display\n");
+ fprintf(stderr, "%s", "wmiikeys: cannot open display\n");
exit(1);
}
XSetErrorHandler(dummy_error_handler);
@@ -429,7 +429,7 @@ int main(int argc, char *argv[])
ixps = wmii_setup_server(sockfile);
if (!(files[K_CTL] = ixp_create(ixps, "/ctl"))) {
- perror("wmikeys: cannot connect IXP server");
+ perror("wmiikeys: cannot connect IXP server");
exit(1);
}
files[K_CTL]->after_write = handle_after_write;
diff --git a/cmd/wmiimenu.1 b/cmd/wmiimenu.1
@@ -1,42 +1,42 @@
.TH WMIMENU 1 wmii-3
.SH NAME
-wmimenu \- window manager improved 2 menu
+wmiimenu \- window manager improved 2 menu
.SH SYNOPSIS
-.B wmimenu
+.B wmiimenu
.B \-s
.I socketfile
.SH DESCRIPTION
.SS Overview
-.B wmimenu
+.B wmiimenu
is a generic, highly customizable, and efficient menu for the X Window System,
originally designed for
.BR wmii (1).
It supports arbitrary, user defined menu contents, which get executed.
Like wmii,
-.B wmimenu
+.B wmiimenu
also implements a socket-based fileserver, which is accessed to configure and
interoperate with other components.
.SS Options
.TP
.BI \-s " socketfile"
specifies the socketfile that
-.B wmimenu
+.B wmiimenu
should create.
.TP
.B \-v
prints version information to stderr, then exits.
.SS Customization
-.B wmimenu
+.B wmiimenu
is customized through manipulating its filesystem namespace.
In the default setup of
.BR wmii (1)
the namespace of
-.B wmimenu
+.B wmiimenu
can be found in /menu.
.SH SEE ALSO
-.BR wmibar (1),
-.BR wmifs (1),
+.BR wmiibar (1),
+.BR wmiifs (1),
.BR wmii (1),
.BR wmiiwm (1),
-.BR wmikeys (1),
-.BR wmir (1)
+.BR wmiikeys (1),
+.BR wmiir (1)
diff --git a/cmd/wmiimenu.c b/cmd/wmiimenu.c
@@ -73,15 +73,15 @@ static Action acttbl[2] = {
};
static char *version[] = {
- "wmimenu - window manager improved menu - " VERSION "\n"
+ "wmiimenu - window manager improved menu - " VERSION "\n"
" (C)opyright MMIV-MMV Anselm R. Garbe\n", 0
};
static void usage()
{
fprintf(stderr, "%s",
- "usage: wmimenu [-s <socket file>] [-r] [-v]\n"
- " -s socket file (default: /tmp/.ixp-$USER/wmimenu-%s-%s)\n"
+ "usage: wmiimenu [-s <socket file>] [-r] [-v]\n"
+ " -s socket file (default: /tmp/.ixp-$USER/wmiimenu-%s-%s)\n"
" -v version info\n");
exit(1);
}
@@ -552,7 +552,7 @@ int main(int argc, char *argv[])
dpy = XOpenDisplay(0);
if (!dpy) {
- fprintf(stderr, "%s", "wmimenu: cannot open display\n");
+ fprintf(stderr, "%s", "wmiimenu: cannot open display\n");
exit(1);
}
screen_num = DefaultScreen(dpy);
@@ -561,7 +561,7 @@ int main(int argc, char *argv[])
/* init */
if (!(files[M_CTL] = ixp_create(ixps, "/ctl"))) {
- perror("wmimenu: cannot connect IXP server");
+ perror("wmiimenu: cannot connect IXP server");
exit(1);
}
files[M_CTL]->after_write = handle_after_write;
diff --git a/cmd/wmiir.1 b/cmd/wmiir.1
@@ -1,38 +1,38 @@
.TH WMIR 1 wmii-3
.SH NAME
-wmir \- window manager improved 2 remote
+wmiir \- window manager improved 2 remote
.SH SYNOPSIS
-.B wmir
+.B wmiir
.RB [ \-s
.IR socketfile ]
.I action
.I action_arg
[...]
.br
-.B wmir
+.B wmiir
.RB [ \-s
.IR socketfile ]
.B \-f
.br
-.B wmir
+.B wmiir
.B \-v
.SH DESCRIPTION
.SS Overview
-.B wmir
+.B wmiir
is a client to access wmi* fileservers for the command line and
scripts. It can be used to configure wmii(1).
.SS Options
.TP
.BI \-s " socketfile"
lets you specify the socketfile to which
-.B wmir
+.B wmiir
a connection will be established. If the environment variable
.B WMIR_SOCKET
-is set and points to a socket file, wmir will use that file, if this
+is set and points to a socket file, wmiir will use that file, if this
option is not supplied.
.TP
.B \-f
-reads from stdin, useful for interactive wmir sessions or for
+reads from stdin, useful for interactive wmiir sessions or for
scripts that write/read a bunch of data, because this speeds things up
due to missing process creation/destruction, ie., a hack.
.TP
@@ -58,14 +58,14 @@ WMIR_SOCKET
See above.
.SH EXAMPLES
.TP
-$ wmir read /
+$ wmiir read /
This gives you an idea about what the wmii filesystem currently looks like.
.TP
-$ wmir write /wm/ctl quit
+$ wmiir write /wm/ctl quit
.SH SEE ALSO
-.BR wmibar (1),
-.BR wmifs (1),
+.BR wmiibar (1),
+.BR wmiifs (1),
.BR wmii (1),
.BR wmiiwm (1),
-.BR wmikeys (1),
-.BR wmimenu (1)
+.BR wmiikeys (1),
+.BR wmiimenu (1)
diff --git a/cmd/wmiir.c b/cmd/wmiir.c
@@ -13,14 +13,14 @@ static IXPClient *c;
static int exit_code = 0;
static char *version[] = {
- "wmir - window manager improved remote - " VERSION "\n"
+ "wmiir - window manager improved remote - " VERSION "\n"
" (C)opyright MMIV-MMV Anselm R. Garbe\n", 0
};
static void usage()
{
fprintf(stderr, "%s",
- "usage: wmir [-s <socket file>] [-v] <action> <action_arg> [...]\n"
+ "usage: wmiir [-s <socket file>] [-v] <action> <action_arg> [...]\n"
" -s socket file (default: $WMIR_SOCKET)\n"
" -f read actions from stdin\n"
" -v version info\n"
@@ -49,7 +49,7 @@ static void perform(char *action, char *file, char *content)
if (crt) {
c->create(c, file);
if (c->errstr) {
- fprintf(stderr, "wmir: error: create %s: %s\n", file,
+ fprintf(stderr, "wmiir: error: create %s: %s\n", file,
c->errstr);
exit_code = 1;
return;
@@ -59,13 +59,13 @@ static void perform(char *action, char *file, char *content)
return;
fd = c->open(c, file);
if (c->errstr) {
- fprintf(stderr, "wmir: error: open %s: %s\n", file, c->errstr);
+ fprintf(stderr, "wmiir: error: open %s: %s\n", file, c->errstr);
exit_code = 1;
return;
}
c->write(c, fd, content, strlen(content));
if (c->errstr) {
- fprintf(stderr, "wmir: error: write %s: %s\n", file,
+ fprintf(stderr, "wmiir: error: write %s: %s\n", file,
c->errstr);
exit_code = 1;
if (!strncmp(c->errstr, DEAD_SERVER, strlen(DEAD_SERVER) + 1))
@@ -76,14 +76,14 @@ static void perform(char *action, char *file, char *content)
return;
fd = c->open(c, file);
if (c->errstr) {
- fprintf(stderr, "wmir: error: open %s: %s\n", file, c->errstr);
+ fprintf(stderr, "wmiir: error: open %s: %s\n", file, c->errstr);
exit_code = 1;
return;
}
do {
out_len = c->read(c, fd, output, 2048);
if (c->errstr) {
- fprintf(stderr, "wmir: error: read %s: %s\n", file,
+ fprintf(stderr, "wmiir: error: read %s: %s\n", file,
c->errstr);
exit_code = 1;
if (!strncmp
@@ -101,7 +101,7 @@ static void perform(char *action, char *file, char *content)
return;
c->remove(c, file);
if (c->errstr) {
- fprintf(stderr, "wmir: error: remove %s: %s\n", file,
+ fprintf(stderr, "wmiir: error: remove %s: %s\n", file,
c->errstr);
exit_code = 1;
return;
@@ -110,7 +110,7 @@ static void perform(char *action, char *file, char *content)
if (fd != -1) {
c->close(c, fd);
if (c->errstr) {
- fprintf(stderr, "wmir: error: close %s: %s\n", file,
+ fprintf(stderr, "wmiir: error: close %s: %s\n", file,
c->errstr);
exit_code = 1;
return;
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
}
}
if ((argc <= 1) || (!read_stdin && (i + 1) >= argc)) {
- fprintf(stderr, "%s", "wmir: arguments: ");
+ fprintf(stderr, "%s", "wmiir: arguments: ");
for (i = 1; i < argc; i++)
fprintf(stderr, "%s, ", argv[i]);
fprintf(stderr, "%s", "\n");
@@ -157,12 +157,12 @@ int main(int argc, char *argv[])
}
if (!sockfile) {
fprintf(stderr, "%s",
- "wmir: error: WMIR_SOCKET environment not set\n");
+ "wmiir: error: WMIR_SOCKET environment not set\n");
usage();
}
/* open socket */
if (!(c = init_ixp_client(sockfile))) {
- fprintf(stderr, "wmir: cannot connect to server '%s'\n", sockfile);
+ fprintf(stderr, "wmiir: cannot connect to server '%s'\n", sockfile);
exit(1);
}
if (read_stdin) {
@@ -210,7 +210,7 @@ int main(int argc, char *argv[])
}
perform(action, file, content);
if (c->errstr)
- fprintf(stderr, "wmir: error: read %s: %s\n", file,
+ fprintf(stderr, "wmiir: error: read %s: %s\n", file,
c->errstr);
}
} else {
diff --git a/cmd/wmiir2.c b/cmd/wmiir2.c
@@ -31,14 +31,14 @@ static Command cmds[] = {
static IXPClient c = { 0 };
static char *version[] = {
- "wmir - window manager improved remote - " VERSION "\n"
+ "wmiir - window manager improved remote - " VERSION "\n"
" (C)opyright MMIV-MMV Anselm R. Garbe\n", 0
};
static void usage()
{
fprintf(stderr, "%s",
- "usage: wmir [-s <socket file>] [-v] <command> <args> [...]\n"
+ "usage: wmiir [-s <socket file>] [-v] <command> <args> [...]\n"
" -s socket file (default: $WMIR_SOCKET)\n"
" -f read commands from stdin\n"
" -v version info\n"
@@ -62,7 +62,7 @@ static u32 write_data(u32 fid, u8 * data, u32 count)
if (ixp_client_write
(&c, fid, i * c.fcall.iounit, len,
&data[i * c.fcall.iounit]) != count) {
- fprintf(stderr, "wmir: cannot write file: %s\n", c.errstr);
+ fprintf(stderr, "wmiir: cannot write file: %s\n", c.errstr);
return 0;
}
}
@@ -78,14 +78,14 @@ static int xcreate(char **argv)
/* walk to bottom-most directory */
*p = 0;
if (!ixp_client_walk(&c, fid, argv[0])) {
- fprintf(stderr, "wmir: cannot walk to %s: %s\n", argv[0],
+ fprintf(stderr, "wmiir: cannot walk to %s: %s\n", argv[0],
c.errstr);
return 1;
}
/* create */
p++;
if (!ixp_client_create(&c, fid, p, (u32) 0xff, IXP_OWRITE)) {
- fprintf(stderr, "wmir: cannot create file: %s\n", c.errstr);
+ fprintf(stderr, "wmiir: cannot create file: %s\n", c.errstr);
return 1;
}
write_data(fid, (u8 *) argv[1], strlen(argv[1]));
@@ -97,7 +97,7 @@ static int xwrite(char **argv)
/* open */
u32 fid = c.root_fid << 2;
if (!ixp_client_open(&c, fid, argv[0], IXP_OWRITE)) {
- fprintf(stderr, "wmir: cannot open file: %s\n", c.errstr);
+ fprintf(stderr, "wmiir: cannot open file: %s\n", c.errstr);
return 1;
}
write_data(fid, (u8 *) argv[1], strlen(argv[1]));
@@ -129,14 +129,14 @@ static int xread(char **argv)
/* open */
if (!ixp_client_open(&c, fid, argv[0], IXP_OREAD)) {
- fprintf(stderr, "wmir: cannot open file: %s\n", c.errstr);
+ fprintf(stderr, "wmiir: cannot open file: %s\n", c.errstr);
return 1;
}
is_directory = !c.fcall.nwqid || (c.fcall.qid.type == IXP_QTDIR);
/* read */
if (!(count = ixp_client_read(&c, fid, 0, result, IXP_MAX_MSG))
&& c.errstr) {
- fprintf(stderr, "wmir: cannot read file: %s\n", c.errstr);
+ fprintf(stderr, "wmiir: cannot read file: %s\n", c.errstr);
return 1;
}
if (count) {
@@ -158,7 +158,7 @@ static int xremove(char **argv)
/* remove */
fid = c.root_fid << 2;
if (!ixp_client_remove(&c, fid, argv[0])) {
- fprintf(stderr, "wmir: cannot remove file: %s\n", c.errstr);
+ fprintf(stderr, "wmiir: cannot remove file: %s\n", c.errstr);
return 1;
}
return 0;
@@ -208,7 +208,7 @@ int main(int argc, char *argv[])
}
}
if ((argc <= 1) || (!read_stdin && (i + 1) >= argc)) {
- fprintf(stderr, "%s", "wmir: arguments: ");
+ fprintf(stderr, "%s", "wmiir: arguments: ");
for (i = 1; i < argc; i++)
fprintf(stderr, "%s, ", argv[i]);
fprintf(stderr, "%s", "\n");
@@ -216,12 +216,12 @@ int main(int argc, char *argv[])
}
if (!sockfile) {
fprintf(stderr, "%s",
- "wmir: error: WMIR_SOCKET environment not set\n");
+ "wmiir: error: WMIR_SOCKET environment not set\n");
usage();
}
/* open socket */
if (!ixp_client_init(&c, sockfile)) {
- fprintf(stderr, "wmir: %s\n", c.errstr);
+ fprintf(stderr, "wmiir: %s\n", c.errstr);
exit(1);
}
/* wether perform directly or read from stdin */
