chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
basic/strv: use SWAP_TWO() macro (#3602)
[elogind.git]
/
src
/
basic
/
user-util.c
diff --git
a/src/basic/user-util.c
b/src/basic/user-util.c
index e6f3803a3b5b8bc476ec6c9176a01df62fc18769..f57555422739cadc4742d1fd490ab7769e245b89 100644
(file)
--- a/
src/basic/user-util.c
+++ b/
src/basic/user-util.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-19,17
+17,28
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <alloca.h>
+#include <errno.h>
+#include <fcntl.h>
#include <grp.h>
#include <pwd.h>
#include <grp.h>
#include <pwd.h>
-
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "missing.h"
#include "alloc-util.h"
#include "fd-util.h"
#include "alloc-util.h"
#include "fd-util.h"
+#include "formats-util.h"
#include "macro.h"
#include "parse-util.h"
#include "path-util.h"
#include "string-util.h"
#include "user-util.h"
#include "macro.h"
#include "parse-util.h"
#include "path-util.h"
#include "string-util.h"
#include "user-util.h"
-#include "util.h"
bool uid_is_valid(uid_t uid) {
bool uid_is_valid(uid_t uid) {
@@
-67,7
+76,6
@@
int parse_uid(const char *s, uid_t *ret) {
return 0;
}
return 0;
}
-#if 0 /// UNNEEDED by elogind
char* getlogname_malloc(void) {
uid_t uid;
struct stat st;
char* getlogname_malloc(void) {
uid_t uid;
struct stat st;
@@
-80,6
+88,7
@@
char* getlogname_malloc(void) {
return uid_to_name(uid);
}
return uid_to_name(uid);
}
+#if 0 /// UNNEEDED by elogind
char *getusername_malloc(void) {
const char *e;
char *getusername_malloc(void) {
const char *e;