From bb0d694a8729ec261cafbea36ded8a490c966177 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Thu, 24 Mar 2005 12:44:17 +0000 Subject: [PATCH] s!write()!Vwrite()! at some places git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1980 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/src/filetime.c | 2 +- util-vserver/src/lsxid.c | 16 +++++++-------- util-vserver/src/readlink.c | 2 +- util-vserver/src/reducecap.c | 4 ++-- util-vserver/src/showattr.c | 6 +++--- util-vserver/src/vattribute.c | 6 +++--- util-vserver/src/vcontext.c | 2 +- util-vserver/src/vcopy.c | 2 +- util-vserver/src/vdlimit.c | 2 +- util-vserver/src/vlimit.c | 2 +- util-vserver/src/vps.c | 30 ++++++++++++++--------------- util-vserver/src/vserver-stat.c | 4 ++-- util-vserver/src/vuname.c | 2 +- util-vserver/src/vunify.c | 8 ++++---- util-vserver/vserver-start/interface-read.c | 6 +++--- 15 files changed, 47 insertions(+), 47 deletions(-) diff --git a/util-vserver/src/filetime.c b/util-vserver/src/filetime.c index f8b3f54..8504b51 100644 --- a/util-vserver/src/filetime.c +++ b/util-vserver/src/filetime.c @@ -95,7 +95,7 @@ int main (int argc, char *argv[]) l += utilvserver_fmt_ulong(buf+l, minutes); buf[l++] = '\n'; - (void)write(1, buf, l); + Vwrite(1, buf, l); return EXIT_SUCCESS; } diff --git a/util-vserver/src/lsxid.c b/util-vserver/src/lsxid.c index bfcb47d..cc1f88d 100644 --- a/util-vserver/src/lsxid.c +++ b/util-vserver/src/lsxid.c @@ -153,7 +153,7 @@ handleFile(char const *name, char const *display_name) if (ctx==VC_NOCTX) { memcpy(buf, "!!ERR!!", 7); - write(1, buf, sizeof buf); + Vwrite(1, buf, sizeof buf); need_write = false; } else if (global_args->do_mapping) { @@ -161,8 +161,8 @@ handleFile(char const *name, char const *display_name) if (!vname) buf[0] = '\0'; else { size_t l = strlen(vname); - if (leffective & bit) ? 'X' : ' '; buf[23 + 10*1 + 4] = (user->permitted & bit) ? 'X' : ' '; buf[23 + 10*2 + 4] = (user->inheritable & bit) ? 'X' : ' '; - write(1, buf, len); + Vwrite(1, buf, len); } } @@ -258,7 +258,7 @@ int main (int argc, char *argv[]) flags = vc_list2cflag_compat(optarg, 0, &err); if (err.ptr!=0) { WRITE_MSG(2, "Unknown flag '"); - write(2, err.ptr, err.len); + Vwrite(2, err.ptr, err.len); WRITE_MSG(2, "'\n"); exit(wrapper_exit_code); } diff --git a/util-vserver/src/showattr.c b/util-vserver/src/showattr.c index c5a04dd..7339dab 100644 --- a/util-vserver/src/showattr.c +++ b/util-vserver/src/showattr.c @@ -131,9 +131,9 @@ handleFile(char const *name, char const *display_name) res = false; } - write(1, buf, 8); - write(1, display_name, strlen(display_name)); - write(1, "\n", 1); + Vwrite(1, buf, 8); + Vwrite(1, display_name, strlen(display_name)); + Vwrite(1, "\n", 1); return res; } diff --git a/util-vserver/src/vattribute.c b/util-vserver/src/vattribute.c index bb78491..a20c0e6 100644 --- a/util-vserver/src/vattribute.c +++ b/util-vserver/src/vattribute.c @@ -99,7 +99,7 @@ parseFlags(char const *str, struct vc_ctx_flags *flags) if (rc==-1) { WRITE_MSG(2, "Unknown flag '"); - write(2, err.ptr, err.len); + Vwrite(2, err.ptr, err.len); WRITE_MSG(2, "'\n"); exit(wrapper_exit_code); } @@ -115,7 +115,7 @@ parseBCaps(char const *str, struct vc_ctx_caps *caps) if (rc==-1) { WRITE_MSG(2, "Unknown bcap '"); - write(2, err.ptr, err.len); + Vwrite(2, err.ptr, err.len); WRITE_MSG(2, "'\n"); exit(wrapper_exit_code); } @@ -131,7 +131,7 @@ parseCCaps(char const *str, struct vc_ctx_caps *caps) if (rc==-1) { WRITE_MSG(2, "Unknown ccap '"); - write(2, err.ptr, err.len); + Vwrite(2, err.ptr, err.len); WRITE_MSG(2, "'\n"); exit(wrapper_exit_code); } diff --git a/util-vserver/src/vcontext.c b/util-vserver/src/vcontext.c index 0d979cf..ccc3236 100644 --- a/util-vserver/src/vcontext.c +++ b/util-vserver/src/vcontext.c @@ -164,7 +164,7 @@ tellContext(xid_t ctx, bool do_it) l = utilvserver_fmt_long(buf,ctx); WRITE_MSG(1, "New security context is "); - write(1, buf, l); + Vwrite (1, buf, l); WRITE_MSG(1, "\n"); } diff --git a/util-vserver/src/vcopy.c b/util-vserver/src/vcopy.c index cacf814..fd17623 100644 --- a/util-vserver/src/vcopy.c +++ b/util-vserver/src/vcopy.c @@ -193,7 +193,7 @@ doit(Operation op, else if (op==opSKIP) WRITE_MSG(1, "skipping '"); else { assert(false); abort(); } - write(1, show_path->d, show_path->l); + Vwrite(1, show_path->d, show_path->l); WRITE_MSG(1, "'\n"); } diff --git a/util-vserver/src/vdlimit.c b/util-vserver/src/vdlimit.c index e52de01..b0c8fd8 100644 --- a/util-vserver/src/vdlimit.c +++ b/util-vserver/src/vdlimit.c @@ -114,7 +114,7 @@ writeInt(int fd, char const *prefix, int val) if (prefix) WRITE_STR(fd, prefix); - (void)write(fd, buf, len); + Vwrite(fd, buf, len); } static void diff --git a/util-vserver/src/vlimit.c b/util-vserver/src/vlimit.c index 9400ef2..27c0a77 100644 --- a/util-vserver/src/vlimit.c +++ b/util-vserver/src/vlimit.c @@ -217,7 +217,7 @@ showAll(int ctx) ptr = appendLimit(buf+50, mask.hard&bitmask, limit.hard); *ptr++ = '\n'; - write(1, buf, ptr-buf); + Vwrite(1, buf, ptr-buf); } } diff --git a/util-vserver/src/vps.c b/util-vserver/src/vps.c index aae3bbf..a3055a3 100644 --- a/util-vserver/src/vps.c +++ b/util-vserver/src/vps.c @@ -82,21 +82,21 @@ writeContextInfo(xid_t ctx, char const *name) size_t res = CTXNR_WIDTH + 1; if (ctx==VC_NOCTX) { - if (3do_revert) WRITE_MSG(1, "deunifying '"); else WRITE_MSG(1, "unifying '"); - write(1, src_path->d, src_path->l); + Vwrite(1, src_path->d, src_path->l); WRITE_MSG(1, "'"); if (Global_getVerbosity()>=4) { WRITE_MSG(1, " (from "); if (Global_getVerbosity()==4 && mlist->id.d) - write(1, mlist->id.d, mlist->id.l); + Vwrite(1, mlist->id.d, mlist->id.l); else - write(1, mlist->root.d, mlist->root.l); + Vwrite(1, mlist->root.d, mlist->root.l); WRITE_MSG(1, ")"); } WRITE_MSG(1, "\n"); @@ -328,7 +328,7 @@ visitDirEntry(struct dirent const *ent) (Global_getVerbosity()>=6 && is_dotfile) || (Global_getVerbosity()>=6 && is_link)) ) { WRITE_MSG(1, " skipping '"); - write(1, path.d, path.l); + Vwrite(1, path.d, path.l); WRITE_MSG(1, "'"); if (Global_getVerbosity()>=2) printSkipReason(); WRITE_MSG(1, "\n"); diff --git a/util-vserver/vserver-start/interface-read.c b/util-vserver/vserver-start/interface-read.c index 09825b6..d04b7ae 100644 --- a/util-vserver/vserver-start/interface-read.c +++ b/util-vserver/vserver-start/interface-read.c @@ -46,7 +46,7 @@ assumeNonNull(PathInfo const *cfgdir, char const *file, char const *val) if (val!=0) return 0; WRITE_MSG(2, "vserver-start: no value configured for '"); - write(2, cfgdir->d, cfgdir->l); + Vwrite (2, cfgdir->d, cfgdir->l); WRITE_MSG(2, "/"); WRITE_STR(2, file); WRITE_STR(2, "'\n"); @@ -91,7 +91,7 @@ Iface_read(struct Interface *res, PathInfo *cfgdir, if (mask && prefix) { WRITE_MSG(2, "vserver-start: both 'prefix' and 'mask' specified in '"); - write(2, cfgdir->d, cfgdir->l); + Vwrite (2, cfgdir->d, cfgdir->l); WRITE_MSG(2, "'\n"); goto err; } @@ -109,7 +109,7 @@ Iface_read(struct Interface *res, PathInfo *cfgdir, int p = atoi(prefix); if (p==0) { WRITE_MSG(2, "vserver-start: invalid 'prefix' specified in '"); - write(2, cfgdir->d, cfgdir->l); + Vwrite (2, cfgdir->d, cfgdir->l); WRITE_MSG(2, "'\n"); goto err; } -- 1.8.1.5