bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed sysctl call on NetBSD

Browse Source
This commit is contained in:
Michiel Broek 2005-09-02 20:02:16 +00:00
parent b4c5c9a7a9
commit 60655024b6
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
unix/mbpasswd.c
View File

@ -849,12 +849,17 @@ int main(int argc, char *argv[])
#endif
pid_t ppid;
char *parent;
#if defined(__OpenBSD__) || defined(__NetBSD__)
#if defined(__OpenBSD__)
#define ARG_SIZE 60
static char **s, buf[ARG_SIZE];
size_t siz = 100;
char **p;
int mib[4];
#elif defined(__NetBSD__)
#define ARG_SIZE 60
static char **s;
size_t siz = 100;
int mib[4];
#else
char temp[PATH_MAX];
FILE *fp;
@ -902,7 +907,7 @@ int main(int argc, char *argv[])
*/
ppid = getppid();
#if defined(__OpenBSD__) || defined(__NetBSD__)
#if defined(__OpenBSD__)
/*
* Systems that use sysctl to get process information
*/
@ -925,8 +930,25 @@ int main(int argc, char *argv[])
strlcat(buf, " ", sizeof(buf));
strlcat(buf, *p, sizeof(buf));
}
printf("%s\n", buf);
parent = xstrcpy(buf);
#elif defined(__NetBSD__)
/*
* Systems that use sysctl to get process information
*/
mib[0] = CTL_KERN;
mib[1] = KERN_PROC_ARGS;
mib[2] = ppid;
mib[3] = KERN_PROC_ARGV;
if ((s = realloc(s, siz)) == NULL) {
fprintf(stderr, "mbpasswd: no memory\n");
exit(1);
}
if (sysctl(mib, 4, s, &siz, NULL, 0) == -1) {
perror("");
fprintf(stderr, "mbpasswd: sysctl call failed\n");
exit(1);
}
parent = xstrcpy((char *)s);
#else
/*
* Systems with /proc filesystem like Linux, FreeBSD
@ -944,7 +966,7 @@ int main(int argc, char *argv[])
#endif
if (strcmp((char *)"mbsetup", parent) && strcmp((char *)"-mbsebbs", parent) && strcmp((char *)"-mbnewusr", parent)) {
fprintf(stderr, "mbpasswd: illegal parent\n");
fprintf(stderr, "mbpasswd: illegal parent \"%s\"\n", parent);
syslog(LOG_ERR, "mbpasswd: illegal parent \"%s\"", parent);
free(myname);
exit(E_FAILURE);

21
unix/mbuseradd.c
View File

@ -244,7 +244,6 @@ int main(int argc, char *argv[])
/*
* Systems that use sysctl to get process information
*/
printf("using sysctl\n");
mib[0] = CTL_KERN;
mib[1] = KERN_PROC_ARGS;
mib[2] = ppid;
@ -253,28 +252,22 @@ printf("using sysctl\n");
fprintf(stderr, "mbuseradd: no memory\n");
exit(1);
}
printf("will call\n");
if (sysctl(mib, 4, s, &siz, NULL, 0) == -1) {
perror("");
fprintf(stderr, "mbuseradd: sysctl call failed\n");
exit(1);
}
printf("done\n");
buf[0] = '\0';
for (p = s; *p != NULL; p++) {
if (p != s)
strlcat(buf, " ", sizeof(buf));
strlcat(buf, *p, sizeof(buf));
}
parent = xstrcpy((char *)s);
printf("almost done\n");
parent = xstrcpy(buf);
printf("%s\n", parent);
#elif defined(__NetBSD__)
/*
* Systems that use sysctl to get process information
*/
printf("using sysctl\n");
mib[0] = CTL_KERN;
mib[1] = KERN_PROC_ARGS;
mib[2] = ppid;
@ -283,24 +276,12 @@ printf("using sysctl\n");
fprintf(stderr, "mbuseradd: no memory\n");
exit(1);
}
printf("will call\n");
if (sysctl(mib, 4, s, &siz, NULL, 0) == -1) {
perror("");
fprintf(stderr, "mbuseradd: sysctl call failed\n");
exit(1);
}
printf("done\n");
// buf[0] = '\0';
printf("%s\n", (char *)s);
// for (p = s; *p != NULL; p++) {
// if (p != s)
// strlcat(buf, " ", sizeof(buf));
// strlcat(buf, *p, sizeof(buf));
// }
parent = xstrcpy((char *)s);
printf("almost done\n");
// parent = xstrcpy(buf);
printf("%s\n", parent);
#else
/*
* Systems with /proc filesystem like Linux, FreeBSD
@ -316,7 +297,7 @@ printf("%s\n", parent);
#endif
if (strcmp((char *)"-mbnewusr", parent)) {
fprintf(stderr, "mbuseradd: illegal parent\n");
fprintf(stderr, "mbuseradd: illegal parent \"%s\"\n", parent);
free(temp);
free(parent);
exit(1);