#include <errno.h>
#include <sys/utsname.h>
#include <dirent.h>
+#include <strings.h>
#define ENSC_WRAPPERS_FCNTL 1
#define ENSC_WRAPPERS_IO 1
#define ENSC_WRAPPERS_VSERVER 1
#include <wrappers.h>
-typedef enum { tgNONE,tgCONTEXT, tgRUNNING,
+typedef enum { tgNONE,tgCONTEXT, tgID, tgRUNNING,
tgVDIR, tgNAME, tgCFGDIR, tgAPPDIR,
- tgAPIVER,
+ tgAPIVER, tgPXID,
tgINITPID, tgINITPID_PID,
tgXID, tgUTS, tgSYSINFO,
- tgFEATURE,
+ tgFEATURE, tgCANONIFY,
} VserverTag;
static struct {
} const TAGS[] = {
{ "CONTEXT", tgCONTEXT, ("the current and/or assigned context; when an optinal argument "
"evaluates to false,only the current context will be printed") },
+ { "ID", tgID, "gives out the vserver-id for the context-xid" },
{ "RUNNING", tgRUNNING, "gives out '1' when vserver is running; else, it fails without output" },
{ "VDIR", tgVDIR, "gives out the root-directory of the vserver" },
{ "NAME", tgNAME, "gives out the name of the vserver" },
"machine and domainname") },
{ "SYSINFO", tgSYSINFO, "gives out information about the systen" },
{ "FEATURE", tgFEATURE, "returns 0 iff the queried feature is supported" },
+ { "PXID", tgPXID, "returns the xid of the parent context" },
+ { "CANONIFY", tgCANONIFY, "canonifies the vserver-name and removes dangerous characters" },
};
int wrapper_exit_code = 1;
}
static char *
+getPXid(char UNUSED *buf, char const UNUSED *vserver)
+{
+ // TODO: implement me when available
+ return 0;
+}
+
+static char *
getInitPid_native(char *buf, xid_t xid)
{
struct vc_vx_info info;
pos = strstr(buf, "\ninitpid: ");
if (pos!=0) {
- pos += sizeof("\ninitpid: ")-1;
+ pos += sizeof("\ninitpid: ")-1;
if (strncmp(pos, "none", 4)==0) *res = -1;
else *res = atoi(pos);
}
{
struct dirent **namelist;
int n;
-
- vc_new_s_context(1,0,0); // ignore errors silently...
+
+ switchToWatchXid(0); // ignore errors silently...
n = scandir("/proc", &namelist, selectPid, alphasort);
if (n<0) perror("scandir()");
else while (n--) {
static bool
str2bool(char const *str)
{
- return atoi(str)!=0 || strchr("yYtY", str[0])!=0;
+ return atoi(str)!=0 || strchr("yYtY", str[0])!=0 || strcasecmp("true", str)==0;
}
static int
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' ? vc_xidopt2xid(vserver,true,0) : VC_SAMECTX;
+ char buf[sizeof(xid_t)*4 + 1024 + strlen(vserver)];
memset(buf, 0, sizeof buf);
switch (tag) {
res = (vc_getVserverCtx(vserver, vcCFG_AUTO, false, 0)==VC_NOCTX) ? 0 : "1";
break;
+ case tgCANONIFY :
+ strcpy(buf, vserver);
+ if (canonifyVserverName(buf)>0) res = buf;
+ break;
+
case tgCONTEXT : res = getContext(buf, vserver,
argc==0 || str2bool(argv[0])); break;
- case tgXID : res = getXid(buf, vserver); break;
- case tgINITPID : res = getInitPid(buf, xid); break;
case tgINITPID_PID : res = getInitPidPid(buf, vserver); break;
case tgAPIVER : res = getAPIVer(buf); break;
- case tgUTS : res = getUTS(buf, xid, argc, argv); break;
+ case tgXID : res = getXid(buf, vserver); break;
+ case tgPXID : res = getPXid(buf, vserver); break;
case tgSYSINFO : return printSysInfo(buf); break;
case tgFEATURE : return testFeature(argc,argv); break;
+
+
+ default : {
+ xid_t xid = *vserver!='\0' ? vc_xidopt2xid(vserver,true,0) : VC_SAMECTX;
+
+ switch (tag) {
+ case tgID : res = vc_getVserverByCtx(xid,0,0); break;
+ case tgINITPID : res = getInitPid(buf, xid); break;
+ case tgUTS : res = getUTS(buf, xid, argc, argv); break;
- default : assert(false); abort(); // TODO
+ default : assert(false); abort(); // TODO
+ }
+ }
}
if (res==0) return EXIT_FAILURE;
}
if (optind+2>argc) {
- WRITE_MSG(2, "No vserver or tag give; please try '--help' for more information.\n");
- exit(1);
+ execQuery("-", tgSYSINFO, 0, 0);
+ WRITE_MSG(2, "\nAssumed 'SYSINFO' as no other option given; try '--help' for more information.\n");
+ exit(0);
}
vserver = argv[optind];