chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
volume_id: better DDF raid detection
[elogind.git]
/
extras
/
fstab_import
/
fstab_import.c
diff --git
a/extras/fstab_import/fstab_import.c
b/extras/fstab_import/fstab_import.c
index 0f4685ae2a89ce89c428b403fa85bd3df0a99314..e793604faa2e2e9019c340d2df157c4df8b384b5 100644
(file)
--- a/
extras/fstab_import/fstab_import.c
+++ b/
extras/fstab_import/fstab_import.c
@@
-13,8
+13,6
@@
#define _GNU_SOURCE 1
#endif
#define _GNU_SOURCE 1
#endif
-#include "config.h"
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@
-68,9
+66,9
@@
int main(int argc, char *argv[])
{
struct udev *udev;
static const struct option options[] = {
{
struct udev *udev;
static const struct option options[] = {
- { "export",
0
, NULL, 'x' },
- { "debug",
0
, NULL, 'd' },
- { "help",
0
, NULL, 'h' },
+ { "export",
no_argument
, NULL, 'x' },
+ { "debug",
no_argument
, NULL, 'd' },
+ { "help",
no_argument
, NULL, 'h' },
{}
};
char **devices;
{}
};
char **devices;
@@
-146,7
+144,7
@@
int main(int argc, char *argv[])
if (label[0] == '"' || label[0] == '\'') {
char *pos;
if (label[0] == '"' || label[0] == '\'') {
char *pos;
- strlcpy(str, &label[1], sizeof(str));
+
util_
strlcpy(str, &label[1], sizeof(str));
pos = strrchr(str, label[0]);
if (pos == NULL)
continue;
pos = strrchr(str, label[0]);
if (pos == NULL)
continue;
@@
-170,7
+168,7
@@
int main(int argc, char *argv[])
if (uuid[0] == '"' || uuid[0] == '\'') {
char *pos;
if (uuid[0] == '"' || uuid[0] == '\'') {
char *pos;
- strlcpy(str, &uuid[1], sizeof(str));
+
util_
strlcpy(str, &uuid[1], sizeof(str));
pos = strrchr(str, uuid[0]);
if (pos == NULL)
continue;
pos = strrchr(str, uuid[0]);
if (pos == NULL)
continue;