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

More OpenBSD code

Browse Source
This commit is contained in:
Michiel Broek 2005-08-31 20:22:20 +00:00
parent dd23185130
commit 1910fda555
2 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
unix/mbpasswd.c
View File

@ -846,7 +846,15 @@ int main(int argc, char *argv[])
char temp[PATH_MAX]; char temp[PATH_MAX];
pid_t ppid; pid_t ppid;
char *parent; char *parent;
#if defined(__OpenBSD__)
#define ARG_SIZE 60
static char **s, buf[ARG_SIZE];
size_t siz = 100;
char **p;
int mib[4];
#else
FILE *fp; FILE *fp;
#endif
/* /*
* Init $MBSE_ROOT/etc/login.defs file before the *pw gets overwritten. * Init $MBSE_ROOT/etc/login.defs file before the *pw gets overwritten.
@ -889,6 +897,36 @@ int main(int argc, char *argv[])
* Find out the name of our parent. * Find out the name of our parent.
*/ */
ppid = getppid(); ppid = getppid();
#if defined(__OpenBSD__)
/*
* 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, "mbuseradd: no memory\n");
exit(1);
}
if (sysctl(mib, 4, s, &siz, NULL, 0) == -1) {
perror("");
fprintf(stderr, "mbuseradd: sysctl call failed\n");
exit(1);
}
buf[0] = '\0';
for (p = s; *p != NULL; p++) {
if (p != s)
strlcat(buf, " ", sizeof(buf));
strlcat(buf, *p, sizeof(buf));
}
printf("%s\n", buf);
parent = xstrcpy(buf);
#else
/*
* Systems with /proc filesystem like Linux, FreeBSD
*/
snprintf(temp, PATH_MAX, "/proc/%d/cmdline", ppid); snprintf(temp, PATH_MAX, "/proc/%d/cmdline", ppid);
if ((fp = fopen(temp, "r")) == NULL) { if ((fp = fopen(temp, "r")) == NULL) {
fprintf(stderr, "mbpasswd: can't read %s\n", temp); fprintf(stderr, "mbpasswd: can't read %s\n", temp);
@ -899,6 +937,7 @@ int main(int argc, char *argv[])
fgets(temp, PATH_MAX-1, fp); fgets(temp, PATH_MAX-1, fp);
fclose(fp); fclose(fp);
parent = xstrcpy(Basename(temp)); parent = xstrcpy(Basename(temp));
#endif
if (strcmp((char *)"mbsetup", parent) && strcmp((char *)"-mbsebbs", parent) && strcmp((char *)"-mbnewusr", parent)) { if (strcmp((char *)"mbsetup", parent) && strcmp((char *)"-mbsebbs", parent) && strcmp((char *)"-mbnewusr", parent)) {
fprintf(stderr, "mbpasswd: illegal parent\n"); fprintf(stderr, "mbpasswd: illegal parent\n");

8
unix/mbuseradd.c
View File

@ -180,10 +180,10 @@ int main(int argc, char *argv[])
pid_t ppid; pid_t ppid;
#if defined(__OpenBSD__) #if defined(__OpenBSD__)
#define ARG_SIZE 60 #define ARG_SIZE 60
static char **s, buf[ARG_SIZE]; static char **s, buf[ARG_SIZE];
size_t siz = 100; size_t siz = 100;
char **p; char **p;
int mib[4]; int mib[4];
#else #else
FILE *fp; FILE *fp;
#endif #endif