chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow braceless variables to be expanded
[elogind.git]
/
src
/
shared
/
clean-ipc.c
diff --git
a/src/shared/clean-ipc.c
b/src/shared/clean-ipc.c
index 8c60bdc1f2be77ae301b7d95a96ccde5ac87690d..3b4231827725cda1c912e59dcc20a314d17b333f 100644
(file)
--- a/
src/shared/clean-ipc.c
+++ b/
src/shared/clean-ipc.c
@@
-36,7
+36,7
@@
#include "dirent-util.h"
#include "fd-util.h"
#include "fileio.h"
#include "dirent-util.h"
#include "fd-util.h"
#include "fileio.h"
-#include "format
s
-util.h"
+#include "format-util.h"
#include "log.h"
#include "macro.h"
#include "string-util.h"
#include "log.h"
#include "macro.h"
#include "string-util.h"
@@
-225,7
+225,7
@@
static int clean_posix_shm_internal(DIR *dir, uid_t uid, gid_t gid) {
FOREACH_DIRENT_ALL(de, dir, goto fail) {
struct stat st;
FOREACH_DIRENT_ALL(de, dir, goto fail) {
struct stat st;
- if (
STR_IN_SET(de->d_name, "..", "."
))
+ if (
dot_or_dot_dot(de->d_name
))
continue;
if (fstatat(dirfd(dir), de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0) {
continue;
if (fstatat(dirfd(dir), de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0) {
@@
-311,7
+311,7
@@
static int clean_posix_mq(uid_t uid, gid_t gid) {
struct stat st;
char fn[1+strlen(de->d_name)+1];
struct stat st;
char fn[1+strlen(de->d_name)+1];
- if (
STR_IN_SET(de->d_name, "..", "."
))
+ if (
dot_or_dot_dot(de->d_name
))
continue;
if (fstatat(dirfd(dir), de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0) {
continue;
if (fstatat(dirfd(dir), de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0) {