X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futil.h;h=19edf98355d3f3c0913e1a41797bb0a19e59c8b7;hb=88fae6e0441d4195e089434f07d3e7fd811d6297;hp=c8d048f9b28999110ed311776da7a73e90a24b3d;hpb=cd3bd60a2e4bb08526d953a323bbe1a0ace78b9e;p=elogind.git

diff --git a/src/shared/util.h b/src/shared/util.h
index c8d048f9b..19edf9835 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef fooutilhfoo
-#define fooutilhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -257,6 +256,7 @@ int undecchar(char c);
 char *cescape(const char *s);
 char *cunescape(const char *s);
 char *cunescape_length(const char *s, size_t length);
+char *cunescape_length_with_prefix(const char *s, size_t length, const char *prefix);
 
 char *xescape(const char *s, const char *bad);
 
@@ -345,9 +345,11 @@ void rename_process(const char name[8]);
 
 void sigset_add_many(sigset_t *ss, ...);
 
-char* gethostname_malloc(void);
 bool hostname_is_set(void);
+
+char* gethostname_malloc(void);
 char* getlogname_malloc(void);
+char* getusername_malloc(void);
 
 int getttyname_malloc(int fd, char **r);
 int getttyname_harder(int fd, char **r);
@@ -373,6 +375,7 @@ void status_welcome(void);
 
 int fd_columns(int fd);
 unsigned columns(void);
+unsigned columns_uncached(void);
 
 int fd_lines(int fd);
 unsigned lines(void);
@@ -416,10 +419,6 @@ bool nulstr_contains(const char*nulstr, const char *needle);
 
 bool plymouth_running(void);
 
-void parse_syslog_priority(char **p, int *priority);
-void skip_syslog_pid(char **buf);
-void skip_syslog_date(char **buf);
-
 bool hostname_is_valid(const char *s);
 char* hostname_cleanup(char *s);
 
@@ -439,7 +438,7 @@ int fchmod_umask(int fd, mode_t mode);
 bool display_is_local(const char *display);
 int socket_from_display(const char *display, char **path);
 
-int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const char **home);
+int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const char **home, const char **shell);
 int get_group_creds(const char **groupname, gid_t *gid);
 
 int in_group(const char *name);
@@ -451,7 +450,7 @@ int dirent_ensure_type(DIR *d, struct dirent *de);
 int in_search_path(const char *path, char **search);
 int get_files_in_directory(const char *path, char ***list);
 
-char *join(const char *x, ...) _sentinel_;
+char *strjoin(const char *x, ...) _sentinel_;
 
 bool is_main_thread(void);
 
@@ -527,4 +526,5 @@ bool in_initrd(void);
 
 void warn_melody(void);
 
-#endif
+int get_shell(char **ret);
+int get_home_dir(char **ret);