Relocate functions helpers.c -> util.c

The file helpers.c should strictly only be used for misc. helper
functions to the main Finit daemon.  The functions moved in this
commit are generic enough to be used by any deamon or programs,
and for that we have util.c

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

src/util.c

@@ -25,6 +25,8 @@
 
 #include <ctype.h>		/* isprint() */
 #include <errno.h>
+#include <grp.h>
+#include <pwd.h>
 #ifdef HAVE_MNTENT_H
 #include <mntent.h>
 #endif
@@ -178,6 +180,98 @@ char *str(char *fmt, ...)
 	return buf;
 }
 
+int getuser(char *username, char **home)
+{
+#ifdef ENABLE_STATIC
+	if (home)
+		*home = "/";	/* XXX: Fixme */
+	return fgetint("/etc/passwd", "x:\n", username);
+#else
+	struct passwd *usr;
+
+	if (!username || (usr = getpwnam(username)) == NULL)
+		return -1;
+
+	if (home)
+		*home = usr->pw_dir;
+	return  usr->pw_uid;
+#endif
+}
+
+int getgroup(char *group)
+{
+#ifdef ENABLE_STATIC
+	return fgetint("/etc/group", "x:\n", group);
+#else
+	struct group *grp;
+
+	if ((grp = getgrnam(group)) == NULL)
+		return -1;
+
+	return grp->gr_gid;
+#endif
+}
+
+/* get current user */
+int getcuser(char *buf, size_t len)
+{
+	char *ptr = "root";
+
+#ifndef ENABLE_STATIC
+	struct passwd *pw = getpwuid(getuid());
+
+	if (pw)
+		ptr = pw->pw_name;
+#endif
+	if (strlcpy(buf, ptr, len) > len)
+		return -1;
+
+	return 0;
+}
+
+/* get current group */
+int getcgroup(char *buf, size_t len)
+{
+	char *ptr = "root";
+
+#ifndef ENABLE_STATIC
+	struct group *gr = getgrgid(getgid());
+
+	if (gr)
+		ptr = gr->gr_name;
+#endif
+	if (strlcpy(buf, ptr, len) > len)
+		return -1;
+
+	return 0;
+}
+
+int mksubsys(const char *dir, mode_t mode, char *user, char *group)
+{
+	mode_t omask;
+	int uid, gid;
+	int rc = 0;
+
+	omask = umask(0);
+
+	uid = getuser(user, NULL);
+	if (uid >= 0) {
+		gid = getgroup(group);
+		if (gid < 0)
+			gid = 0;
+
+		rc = makedir(dir, mode);
+		if (rc && errno == EEXIST)
+			rc = chmod(dir, mode);
+		if (chown(dir, uid, gid))
+			err(1, "Failed chown(%s, %d, %d)", dir, uid, gid);
+	}
+
+	umask(omask);
+
+	return rc;
+}
+
 int fnread(char *buf, size_t len, char *fmt, ...)
 {
 	char path[256];