#include <stdio.h>
#include <unistd.h>
-#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
static int umid_is_random = 1;
static int umid_inited = 0;
-static int make_umid(void);
+static int make_umid(int (*printer)(const char *fmt, ...));
-static int __init set_umid(char *name, int is_random)
+static int __init set_umid(char *name, int is_random,
+ int (*printer)(const char *fmt, ...))
{
if(umid_inited){
- printk("Unique machine name can't be set twice\n");
+ (*printer)("Unique machine name can't be set twice\n");
return(-1);
}
if(strlen(name) > UMID_LEN - 1)
- printk("Unique machine name is being truncated to %s "
- "characters\n", UMID_LEN);
+ (*printer)("Unique machine name is being truncated to %d "
+ "characters\n", UMID_LEN);
strlcpy(umid, name, sizeof(umid));
umid_is_random = is_random;
static int __init set_umid_arg(char *name, int *add)
{
- return(set_umid(name, 0));
+ return(set_umid(name, 0, printf));
}
__uml_setup("umid=", set_umid_arg,
{
int n;
- if(!umid_inited && make_umid()) return(-1);
+ if(!umid_inited && make_umid(printk)) return(-1);
n = strlen(uml_dir) + strlen(umid) + strlen(name) + 1;
if(n > len){
{
char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")];
char pid[sizeof("nnnnn\0")];
- int fd;
+ int fd, n;
if(umid_file_name("pid", file, sizeof(file))) return 0;
fd = os_open_file(file, of_create(of_excl(of_rdwr(OPENFLAGS()))),
0644);
if(fd < 0){
- printk("Open of machine pid file \"%s\" failed - "
- "errno = %d\n", file, -fd);
+ printf("Open of machine pid file \"%s\" failed - "
+ "err = %d\n", file, -fd);
return 0;
}
sprintf(pid, "%d\n", os_getpid());
- if(write(fd, pid, strlen(pid)) != strlen(pid))
- printk("Write of pid file failed - errno = %d\n", errno);
- close(fd);
+ n = os_write_file(fd, pid, strlen(pid));
+ if(n != strlen(pid))
+ printf("Write of pid file failed - err = %d\n", -n);
+ os_close_file(fd);
return 0;
}
int len;
char file[256];
- if((directory = opendir(dir)) == NULL){
+ directory = opendir(dir);
+ if(directory == NULL){
printk("actually_do_remove : couldn't open directory '%s', "
"errno = %d\n", dir, errno);
return(1);
{
char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")];
char pid[sizeof("nnnnn\0")], *end;
- int dead, fd, p;
+ int dead, fd, p, n;
sprintf(file, "%s/pid", dir);
dead = 0;
- if((fd = os_open_file(file, of_read(OPENFLAGS()), 0)) < 0){
+ fd = os_open_file(file, of_read(OPENFLAGS()), 0);
+ if(fd < 0){
if(fd != -ENOENT){
printk("not_dead_yet : couldn't open pid file '%s', "
- "errno = %d\n", file, -fd);
+ "err = %d\n", file, -fd);
return(1);
}
dead = 1;
}
if(fd > 0){
- if(read(fd, pid, sizeof(pid)) < 0){
+ n = os_read_file(fd, pid, sizeof(pid));
+ if(n < 0){
printk("not_dead_yet : couldn't read pid file '%s', "
- "errno = %d\n", file, errno);
+ "err = %d\n", file, -n);
return(1);
}
p = strtoul(pid, &end, 0);
static int __init set_uml_dir(char *name, int *add)
{
if((strlen(name) > 0) && (name[strlen(name) - 1] != '/')){
- uml_dir = malloc(strlen(name) + 1);
+ uml_dir = malloc(strlen(name) + 2);
if(uml_dir == NULL){
- printk("Failed to malloc uml_dir - error = %d\n",
+ printf("Failed to malloc uml_dir - error = %d\n",
errno);
uml_dir = name;
+ /* Return 0 here because do_initcalls doesn't look at
+ * the return value.
+ */
return(0);
}
sprintf(uml_dir, "%s/", name);
}
else uml_dir = name;
- return 0;
+ return(0);
}
static int __init make_uml_dir(void)
char *home = getenv("HOME");
if(home == NULL){
- printk("make_uml_dir : no value in environment for "
+ printf("make_uml_dir : no value in environment for "
"$HOME\n");
exit(1);
}
dir[len + 1] = '\0';
}
- if((uml_dir = malloc(strlen(dir) + 1)) == NULL){
+ uml_dir = malloc(strlen(dir) + 1);
+ if(uml_dir == NULL){
printf("make_uml_dir : malloc failed, errno = %d\n", errno);
exit(1);
}
strcpy(uml_dir, dir);
if((mkdir(uml_dir, 0777) < 0) && (errno != EEXIST)){
- printk("Failed to mkdir %s - errno = %i\n", uml_dir, errno);
+ printf("Failed to mkdir %s - errno = %i\n", uml_dir, errno);
return(-1);
}
return 0;
}
-static int __init make_umid(void)
+static int __init make_umid(int (*printer)(const char *fmt, ...))
{
int fd, err;
char tmp[strlen(uml_dir) + UMID_LEN + 1];
strlcpy(tmp, uml_dir, sizeof(tmp));
- if(*umid == 0){
+ if(!umid_inited){
strcat(tmp, "XXXXXX");
fd = mkstemp(tmp);
if(fd < 0){
- printk("make_umid - mkstemp failed, errno = %d\n",
- errno);
+ (*printer)("make_umid - mkstemp failed, errno = %d\n",
+ errno);
return(1);
}
- close(fd);
+ os_close_file(fd);
/* There's a nice tiny little race between this unlink and
* the mkdir below. It'd be nice if there were a mkstemp
* for directories.
*/
unlink(tmp);
- set_umid(&tmp[strlen(uml_dir)], 1);
+ set_umid(&tmp[strlen(uml_dir)], 1, printer);
}
sprintf(tmp, "%s%s", uml_dir, umid);
- if((err = mkdir(tmp, 0777)) < 0){
+ err = mkdir(tmp, 0777);
+ if(err < 0){
if(errno == EEXIST){
if(not_dead_yet(tmp)){
- printk("umid '%s' is in use\n", umid);
+ (*printer)("umid '%s' is in use\n", umid);
return(-1);
}
err = mkdir(tmp, 0777);
}
}
if(err < 0){
- printk("Failed to create %s - errno = %d\n", umid, errno);
+ (*printer)("Failed to create %s - errno = %d\n", umid, errno);
return(-1);
}
);
__uml_postsetup(make_uml_dir);
-__uml_postsetup(make_umid);
+
+static int __init make_umid_setup(void)
+{
+ return(make_umid(printf));
+}
+
+__uml_postsetup(make_umid_setup);
__uml_postsetup(create_pid_file);
/*
git://git.onelab.eu / linux-2.6.git / blobdiff