chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysfs: change order of subsystem lookup
[elogind.git]
/
udevsettle.c
diff --git
a/udevsettle.c
b/udevsettle.c
index 3215b3c5baa259c37da5d8d3c69d2d2151da11ba..42a03bafe38cd15452b0a63061eead1b44319e6d 100644
(file)
--- a/
udevsettle.c
+++ b/
udevsettle.c
@@
-1,6
+1,4
@@
/*
/*
- * udevsettle.c
- *
* Copyright (C) 2006 Kay Sievers <kay@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
* Copyright (C) 2006 Kay Sievers <kay@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
@@
-14,7
+12,7
@@
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- *
675 Mass Ave, Cambridge, MA 02139
, USA.
+ *
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA.
*
*/
*
*/
@@
-27,6
+25,7
@@
#include <dirent.h>
#include <fcntl.h>
#include <syslog.h>
#include <dirent.h>
#include <fcntl.h>
#include <syslog.h>
+#include <getopt.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
@@
-36,7
+35,6
@@
#define DEFAULT_TIMEOUT 180
#define LOOP_PER_SECOND 20
#define DEFAULT_TIMEOUT 180
#define LOOP_PER_SECOND 20
-static const char *udev_log_str;
#ifdef USE_LOG
void log_message(int priority, const char *format, ...)
#ifdef USE_LOG
void log_message(int priority, const char *format, ...)
@@
-63,34
+61,40
@@
int main(int argc, char *argv[], char *envp[])
ssize_t len;
int timeout = DEFAULT_TIMEOUT;
int loop;
ssize_t len;
int timeout = DEFAULT_TIMEOUT;
int loop;
- int i;
+ static const struct option options[] = {
+ { "timeout", 1, NULL, 't' },
+ { "help", 0, NULL, 'h' },
+ {}
+ };
+ int option;
int rc = 1;
int rc = 1;
+ int seconds;
logging_init("udevsettle");
udev_config_init();
dbg("version %s", UDEV_VERSION);
logging_init("udevsettle");
udev_config_init();
dbg("version %s", UDEV_VERSION);
+ sysfs_init();
- udev_log_str = getenv("UDEV_LOG");
-
- for (i = 1 ; i < argc; i++) {
- char *arg = argv[i];
-
- if (strncmp(arg, "--timeout=", 10) == 0) {
- char *str = &arg[10];
-
- timeout = atoi(str);
+ while (1) {
+ option = getopt_long(argc, argv, "t:h", options, NULL);
+ if (option == -1)
+ break;
+
+ switch (option) {
+ case 't':
+ seconds = atoi(optarg);
+ if (seconds > 0)
+ timeout = seconds;
+ else
+ fprintf(stderr, "invalid timeout value\n");
dbg("timeout=%i", timeout);
dbg("timeout=%i", timeout);
- if (timeout <= 0) {
- fprintf(stderr, "Invalid timeout value.\n");
- goto exit;
- }
- } else {
- fprintf(stderr, "Usage: udevsettle [--timeout=<seconds>]\n");
+ break;
+ case 'h':
+ printf("Usage: udevsettle [--help] [--timeout=<seconds>]\n\n");
goto exit;
}
}
goto exit;
}
}
- sysfs_init();
strlcpy(queuename, udev_root, sizeof(queuename));
strlcat(queuename, "/" EVENT_QUEUE_DIR, sizeof(queuename));
strlcpy(queuename, udev_root, sizeof(queuename));
strlcat(queuename, "/" EVENT_QUEUE_DIR, sizeof(queuename));
@@
-111,9
+115,9
@@
int main(int argc, char *argv[], char *envp[])
goto exit;
}
goto exit;
}
- /* read current
kernel
seqnum */
- strlcpy(filename,
sysfs_path
, sizeof(filename));
- strlcat(filename, "/
kernel/uevent_seqnum"
, sizeof(filename));
+ /* read current
udev
seqnum */
+ strlcpy(filename,
udev_root
, sizeof(filename));
+ strlcat(filename, "/
" EVENT_SEQNUM
, sizeof(filename));
fd = open(filename, O_RDONLY);
if (fd < 0)
goto exit;
fd = open(filename, O_RDONLY);
if (fd < 0)
goto exit;
@@
-122,12
+126,12
@@
int main(int argc, char *argv[], char *envp[])
if (len <= 0)
goto exit;
seqnum[len] = '\0';
if (len <= 0)
goto exit;
seqnum[len] = '\0';
- seq_
kernel
= strtoull(seqnum, NULL, 10);
- info("
kernel seqnum = %llu", seq_kernel
);
+ seq_
udev
= strtoull(seqnum, NULL, 10);
+ info("
udev seqnum = %llu", seq_udev
);
- /* read current
udev
seqnum */
- strlcpy(filename,
udev_root
, sizeof(filename));
- strlcat(filename, "/
" EVENT_SEQNUM
, sizeof(filename));
+ /* read current
kernel
seqnum */
+ strlcpy(filename,
sysfs_path
, sizeof(filename));
+ strlcat(filename, "/
kernel/uevent_seqnum"
, sizeof(filename));
fd = open(filename, O_RDONLY);
if (fd < 0)
goto exit;
fd = open(filename, O_RDONLY);
if (fd < 0)
goto exit;
@@
-136,8
+140,8
@@
int main(int argc, char *argv[], char *envp[])
if (len <= 0)
goto exit;
seqnum[len] = '\0';
if (len <= 0)
goto exit;
seqnum[len] = '\0';
- seq_
udev
= strtoull(seqnum, NULL, 10);
- info("
udev seqnum = %llu", seq_udev
);
+ seq_
kernel
= strtoull(seqnum, NULL, 10);
+ info("
kernel seqnum = %llu", seq_kernel
);
/* make sure all kernel events have arrived in the queue */
if (seq_udev >= seq_kernel) {
/* make sure all kernel events have arrived in the queue */
if (seq_udev >= seq_kernel) {