chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vol_id: do not fail if unable to drop privileges
[elogind.git]
/
extras
/
ata_id
/
ata_id.c
diff --git
a/extras/ata_id/ata_id.c
b/extras/ata_id/ata_id.c
index a97cc284cc515765ba111ccaf67ad993d0c82d7e..f94cdc0fd315abeb8298571e932932ff4ce5f3bb 100644
(file)
--- a/
extras/ata_id/ata_id.c
+++ b/
extras/ata_id/ata_id.c
@@
-17,15
+17,16
@@
#include <unistd.h>
#include <fcntl.h>
#include <ctype.h>
#include <unistd.h>
#include <fcntl.h>
#include <ctype.h>
+#include <string.h>
#include <errno.h>
#include <errno.h>
+#include <getopt.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <linux/types.h>
#include <linux/hdreg.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <linux/types.h>
#include <linux/hdreg.h>
-#include "../../logging.h"
-#include "../../udev_utils.h"
+#include "../../udev.h"
#ifdef USE_LOG
void log_message(int priority, const char *format, ...)
#ifdef USE_LOG
void log_message(int priority, const char *format, ...)
@@
-91,22
+92,40
@@
int main(int argc, char *argv[])
char serial[21];
char revision[9];
const char *node = NULL;
char serial[21];
char revision[9];
const char *node = NULL;
- int i;
int export = 0;
int fd;
int rc = 0;
int export = 0;
int fd;
int rc = 0;
+ static const struct option options[] = {
+ { "export", 0, NULL, 'x' },
+ { "help", 0, NULL, 'h' },
+ {}
+ };
logging_init("ata_id");
logging_init("ata_id");
-
for (i = 1 ; i < argc; i++
) {
-
char *arg = argv[i]
;
+
while (1
) {
+
int option
;
- if (strcmp(arg, "--export") == 0) {
+ option = getopt_long(argc, argv, "xh", options, NULL);
+ if (option == -1)
+ break;
+
+ switch (option) {
+ case 'x':
export = 1;
export = 1;
- } else
- node = arg;
+ break;
+ case 'h':
+ printf("Usage: ata_id [--export] [--help] <device>\n"
+ " --export print values as environemt keys\n"
+ " --help print this help text\n\n");
+ default:
+ rc = 1;
+ goto exit;
+ }
}
}
- if (!node) {
+
+ node = argv[optind];
+ if (node == NULL) {
err("no node specified");
rc = 1;
goto exit;
err("no node specified");
rc = 1;
goto exit;
@@
-120,8
+139,13
@@
int main(int argc, char *argv[])
}
if (ioctl(fd, HDIO_GET_IDENTITY, &id)) {
}
if (ioctl(fd, HDIO_GET_IDENTITY, &id)) {
- err("HDIO_GET_IDENTITY failed for '%s'", node);
- rc = 3;
+ if (errno == ENOTTY) {
+ info("HDIO_GET_IDENTITY unsupported for '%s'", node);
+ rc = 2;
+ } else {
+ err("HDIO_GET_IDENTITY failed for '%s'", node);
+ rc = 3;
+ }
goto close;
}
goto close;
}