X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Fvuname.c;h=83432f79017f4d7915dca69d22cbc7ed3eb02a91;hb=a917f24ef7b003dcef54a3db2644cf9cb4bc2db2;hp=460cdb268a1cb319ab63cc7d44c875130ddcefcb;hpb=385853895951b3f754508275aa3eb1d4fbc1635c;p=util-vserver.git 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]);