chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libudev-queue.c: simplified open_queue_file
[elogind.git]
/
src
/
shared
/
util.h
diff --git
a/src/shared/util.h
b/src/shared/util.h
index d9b656d2ca081e96ddf76fab60b4e03d35998824..b315593bba4229bb2820a78415d77130f8230329 100644
(file)
--- a/
src/shared/util.h
+++ b/
src/shared/util.h
@@
-1,7
+1,6
@@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef fooutilhfoo
-#define fooutilhfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-345,9
+344,11
@@
void rename_process(const char name[8]);
void sigset_add_many(sigset_t *ss, ...);
void sigset_add_many(sigset_t *ss, ...);
-char* gethostname_malloc(void);
bool hostname_is_set(void);
bool hostname_is_set(void);
+
+char* gethostname_malloc(void);
char* getlogname_malloc(void);
char* getlogname_malloc(void);
+char* getusername_malloc(void);
int getttyname_malloc(int fd, char **r);
int getttyname_harder(int fd, char **r);
int getttyname_malloc(int fd, char **r);
int getttyname_harder(int fd, char **r);
@@
-373,6
+374,7
@@
void status_welcome(void);
int fd_columns(int fd);
unsigned columns(void);
int fd_columns(int fd);
unsigned columns(void);
+unsigned columns_uncached(void);
int fd_lines(int fd);
unsigned lines(void);
int fd_lines(int fd);
unsigned lines(void);
@@
-439,7
+441,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);
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);
int get_group_creds(const char **groupname, gid_t *gid);
int in_group(const char *name);
@@
-527,4
+529,5
@@
bool in_initrd(void);
void warn_melody(void);
void warn_melody(void);
-#endif
+int get_shell(char **ret);
+int get_home_dir(char **ret);