From 44e7d56b12c9068077af46c5931f1d01941f1e4e Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 24 Mar 2004 04:46:37 +0000 Subject: [PATCH] use vc_xidopt2xid() git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1349 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/src/vattribute.c | 10 +++++----- util-vserver/src/vcontext.c | 4 ++-- util-vserver/src/vlimit.c | 10 +++++----- util-vserver/src/vnamespace.c | 6 +++++- util-vserver/src/vserver-info.c | 3 ++- util-vserver/src/vuname.c | 11 ++--------- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/util-vserver/src/vattribute.c b/util-vserver/src/vattribute.c index 30f1850..da87891 100644 --- a/util-vserver/src/vattribute.c +++ b/util-vserver/src/vattribute.c @@ -163,11 +163,11 @@ int main(int argc, char *argv[]) case CMD_HELP : showHelp(1, argv[0], 0); case CMD_VERSION : showVersion(); case CMD_SET : break; // default op currently - case CMD_XID : args.xid = atoi(optarg); break; - case CMD_FLAG : parseFlags(optarg, &args.flags); break; - case CMD_CCAP : parseCCaps(optarg, &args.caps); break; - case CMD_BCAP : parseBCaps(optarg, &args.caps); break; - case CMD_SECURE : parseSecure(&args.flags, &args.caps); break; + case CMD_XID : args.xid = Evc_xidopt2xid(optarg,true); break; + case CMD_FLAG : parseFlags(optarg, &args.flags); break; + case CMD_CCAP : parseCCaps(optarg, &args.caps); break; + case CMD_BCAP : parseBCaps(optarg, &args.caps); break; + case CMD_SECURE : parseSecure(&args.flags, &args.caps); break; default : WRITE_MSG(2, "Try '"); WRITE_STR(2, argv[0]); diff --git a/util-vserver/src/vcontext.c b/util-vserver/src/vcontext.c index 4292c38..ea107d5 100644 --- a/util-vserver/src/vcontext.c +++ b/util-vserver/src/vcontext.c @@ -303,8 +303,8 @@ int main (int argc, char *argv[]) case CMD_SILENTEXIST : args.is_silentexist = true; break; case CMD_SYNCSOCK : args.sync_sock = optarg; break; case CMD_SYNCMSG : args.sync_msg = optarg; break; - case CMD_XID : args.xid = atol(optarg); break; - case CMD_UID : args.uid = atol(optarg); break; + case CMD_UID : args.uid = atol(optarg); break; + case CMD_XID : args.xid = Evc_xidopt2xid(optarg,true); break; case CMD_SILENT : --args.verbosity; break; case CMD_MIGRATESELF : args.do_migrate = true; diff --git a/util-vserver/src/vlimit.c b/util-vserver/src/vlimit.c index ae6bffa..9ff8921 100644 --- a/util-vserver/src/vlimit.c +++ b/util-vserver/src/vlimit.c @@ -368,12 +368,12 @@ int main (int argc, char *argv[]) case CMD_HELP : showHelp(1, argv[0], 0); case CMD_VERSION : showVersion(); case CMD_XID : - case 'c' : ctx = atoi(optarg); break; - case 'a' : show_all = true; break; - case 'n' : do_resolve = false; break; + case 'a' : show_all = true; break; + case 'n' : do_resolve = false; break; + case CMD_DIR : dir = optarg; break; + case CMD_MISSINGOK: missing_ok = true; break; + case 'c' : ctx = Evc_xidopt2xid(optarg,true); break; case 'd' : fmt_func = utilvserver_fmt_uint64; break; - case CMD_DIR : dir = optarg; break; - case CMD_MISSINGOK: missing_ok = true; break; case 'M' : case 'S' : case 'H' : diff --git a/util-vserver/src/vnamespace.c b/util-vserver/src/vnamespace.c index fe90030..c78ce1d 100644 --- a/util-vserver/src/vnamespace.c +++ b/util-vserver/src/vnamespace.c @@ -33,6 +33,7 @@ #define ENSC_WRAPPERS_PREFIX "vnamespace: " #define ENSC_WRAPPERS_UNISTD 1 +#define ENSC_WRAPPERS_VSERVER 1 #include #ifndef CLONE_NEWNS @@ -157,7 +158,10 @@ int main(int argc, char *argv[]) case 'n' : do_new = true; break; case 's' : do_set = true; break; case 'c' : do_cleanup = true; break; - case 'e' : do_enter = true; xid = atol(optarg); break; + case 'e' : + do_enter = true; + xid = Evc_xidopt2xid(optarg,true); + break; default : WRITE_MSG(2, "Try '"); diff --git a/util-vserver/src/vserver-info.c b/util-vserver/src/vserver-info.c index a5ac32e..0231ac8 100644 --- a/util-vserver/src/vserver-info.c +++ b/util-vserver/src/vserver-info.c @@ -39,6 +39,7 @@ #define ENSC_WRAPPERS_FCNTL 1 #define ENSC_WRAPPERS_IO 1 #define ENSC_WRAPPERS_UNISTD 1 +#define ENSC_WRAPPERS_VSERVER 1 #include typedef enum { tgNONE,tgCONTEXT, tgRUNNING, @@ -377,7 +378,7 @@ execQuery(char const *vserver, VserverTag tag, int argc, char *argv[]) { char const * res = 0; char buf[sizeof(xid_t)*4 + 1024]; - xid_t xid = *vserver!='\0' ? (xid_t)(atoi(vserver)) : VC_SAMECTX; + xid_t xid = *vserver!='\0' ? vc_xidopt2xid(vserver,true,0) : VC_SAMECTX; memset(buf, 0, sizeof buf); switch (tag) { diff --git a/util-vserver/src/vuname.c b/util-vserver/src/vuname.c index 460cdb2..83432f7 100644 --- a/util-vserver/src/vuname.c +++ b/util-vserver/src/vuname.c @@ -172,13 +172,6 @@ setFromDir(char const *pathname, bool is_missingok, xid_t xid) } } -static xid_t -str2xid(char const *str) -{ - if (strcmp(str,"self")==0) return Evc_get_task_xid(0); - else return atoi(str); -} - static size_t findUtsIdx(char const *str, size_t len) { @@ -244,8 +237,8 @@ int main(int argc, char *argv[]) case CMD_MISSINGOK: args.is_missingok = true; break; case 'g' : args.do_set = false; break; case 's' : args.do_set = true; break; - case 'x' : args.xid = str2xid(optarg); break; - case 't' : registerValue(optarg, args.tags); break; + case 'x' : args.xid = Evc_xidopt2xid(optarg,true); break; + case 't' : registerValue(optarg, args.tags); break; default : WRITE_MSG(2, "Try '"); WRITE_STR(2, argv[0]); -- 1.8.1.5