SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28344 from YHNdnzj/compare-device-node

Browse Source 
hibernate-resume: add & use devnode_same to compare device nodes
This commit is contained in:
Lennart Poettering
2023-07-12 17:59:28 +02:00
committed by GitHub
parent 2262cbf9fd 0281927686
commit 8620854aa1
5 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/path-util.c
-4
View File
@@ -485,10 +485,6 @@ int path_compare(const char *a, const char *b) {
}
}
bool path_equal_or_inode_same(const char *a, const char *b, int flags) {
return path_equal(a, b) || inode_same(a, b, flags) > 0;
}
int path_compare_filename(const char *a, const char *b) {
_cleanup_free_ char *fa = NULL, *fb = NULL;
int r, j, k;
src/basic/path-util.h
+4 -1
View File
@@ -6,6 +6,7 @@
#include <stddef.h>
#include "macro.h"
#include "stat-util.h"
#include "string-util.h"
#include "strv.h"
#include "time-util.h"
@@ -77,7 +78,9 @@ static inline bool path_equal_filename(const char *a, const char *b) {
return path_compare_filename(a, b) == 0;
}
bool path_equal_or_inode_same(const char *a, const char *b, int flags);
static inline bool path_equal_or_inode_same(const char *a, const char *b, int flags) {
return path_equal(a, b) || inode_same(a, b, flags) > 0;
}
char* path_extend_internal(char **x, ...);
#define path_extend(x, ...) path_extend_internal(x, __VA_ARGS__, POINTER_MAX)