#include <stdio.h>
#include <stdlib.h>
-#include <getopt.h>
#include <unistd.h>
#include <signal.h>
#include <fcntl.h>
#include <stdarg.h>
#include <ctype.h>
#include <sys/stat.h>
-#include <sys/libsysfs.h>
+#ifdef __KLIBC__
+/*
+ * Assume built under udev with KLIBC
+ */
+#include <libsysfs.h>
+#else
+#include <sysfs/libsysfs.h>
+#endif
#include "scsi_id.h"
-#ifndef VERSION
+#ifndef SCSI_ID_VERSION
#warning No version
-#define VERSION "unknown"
+#define SCSI_ID_VERSION "unknown"
#endif
/*
#define CONFIG_FILE "/etc/scsi_id.config"
-#define MAX_NAME_LEN 72
-
-#define MAX_SERIAL_LEN 128
-
static const char short_options[] = "bc:d:ef:gip:s:vV";
-static const struct option long_options[] = {
- {"broken", no_argument, NULL, 'b'}, /* also per dev */
- {"callout", required_argument, NULL, 'c'}, /* also per dev */
- {"device", required_argument, NULL, 'd'},
- {"stderr", no_argument, NULL, 'e'},
- {"file", required_argument, NULL, 'f'},
- {"good", no_argument, NULL, 'g'}, /* also per dev */
- {"busid", no_argument, NULL, 'i'}, /* also per dev */
- {"page", required_argument, NULL, 'p'}, /* also per dev */
- {"devpath", required_argument, NULL, 's'},
- {"verbose", no_argument, NULL, 'v'},
- {"version", no_argument, NULL, 'V'},
- {0, 0, 0, 0}
-};
/*
* Just duplicate per dev options.
*/
static const char dev_short_options[] = "bc:gp:";
-static const struct option dev_long_options[] = {
- {"broken", no_argument, NULL, 'b'}, /* also per dev */
- {"callout", required_argument, NULL, 'c'}, /* also per dev */
- {"good", no_argument, NULL, 'g'}, /* also per dev */
- {"page", required_argument, NULL, 'p'}, /* also per dev */
- {0, 0, 0, 0}
-};
char sysfs_mnt_path[SYSFS_PATH_MAX];
vfprintf(stderr, format, args);
} else {
static int logging_init = 0;
+ static unsigned char logname[32];
if (!logging_init) {
- openlog ("scsi_id", LOG_PID, LOG_DAEMON);
+ /*
+ * klibc does not have LOG_PID.
+ */
+ snprintf(logname, 32, "scsi_id[%d]", getpid());
+ openlog (logname, 0, LOG_DAEMON);
logging_init = 1;
}
static int get_file_options(char *vendor, char *model, int *argc,
char ***newargv)
{
- char buffer[256];
+ char *buffer;
FILE *fd;
char *buf;
char *str1;
int lineno;
int c;
int retval = 0;
- static char *prog_string = "arg0";
dprintf("vendor='%s'; model='%s'\n", vendor, model);
fd = fopen(config_file, "r");
}
}
+ /*
+ * Allocate a buffer rather than put it on the stack so we can
+ * keep it around to parse any options (any allocated newargv
+ * points into this buffer for its strings).
+ */
+ buffer = malloc(MAX_BUFFER_LEN);
+ if (!buffer) {
+ log_message(LOG_WARNING, "Can't allocate memory.\n");
+ return -1;
+ }
+
*newargv = NULL;
lineno = 0;
-
while (1) {
vendor_in = model_in = options_in = NULL;
- buf = fgets(buffer, sizeof(buffer), fd);
+ buf = fgets(buffer, MAX_BUFFER_LEN, fd);
if (buf == NULL)
break;
lineno++;
+ if (buf[strlen(buffer) - 1] != '\n') {
+ log_message(LOG_WARNING,
+ "Config file line %d too long.\n", lineno);
+ break;
+ }
while (isspace(*buf))
buf++;
* Something matched. Allocate newargv, and store
* values found in options_in.
*/
- c = argc_count(options_in) + 2;
+ strcpy(buffer, options_in);
+ c = argc_count(buffer) + 2;
*newargv = calloc(c, sizeof(**newargv));
if (!*newargv) {
log_message(LOG_WARNING,
- "Can't allocate memory\n");
+ "Can't allocate memory.\n");
retval = -1;
} else {
*argc = c;
c = 0;
- (*newargv)[c] = prog_string; /* nothing */
+ /*
+ * argv[0] at 0 is skipped by getopt, but
+ * store the buffer address there for
+ * alter freeing.
+ */
+ (*newargv)[c] = buffer;
for (c = 1; c < *argc; c++)
- (*newargv)[c] = strsep(&options_in, " ");
+ (*newargv)[c] = strsep(&buffer, " ");
}
} else {
/*
retval = 1;
}
}
+ if (retval != 0)
+ free(buffer);
fclose(fd);
return retval;
}
static int set_options(int argc, char **argv, const char *short_opts,
- const struct option *long_opts, char *target,
- char *maj_min_dev)
+ char *target, char *maj_min_dev)
{
int option;
- int option_ind;
/*
- * optind is a global extern used by getopt_long. Since we can
- * call set_options twice (once for command line, and once for
- * config file) we have to reset this back to 0.
+ * optind is a global extern used by getopt. Since we can call
+ * set_options twice (once for command line, and once for config
+ * file) we have to reset this back to 1. [Note glibc handles
+ * setting this to 0, but klibc does not.]
*/
- optind = 0;
+ optind = 1;
while (1) {
- option = getopt_long(argc, argv, short_options, long_options,
- &option_ind);
+ option = getopt(argc, argv, short_options);
if (option == -1)
break;
case 'V':
log_message(LOG_WARNING, "scsi_id version: %s\n",
- VERSION);
+ SCSI_ID_VERSION);
exit(0);
break;
char *vendor;
char *model;
int option;
- int option_ind;
-
*good_bad = all_good;
*page_code = default_page_code;
}
model = sysfs_get_attr(scsi_dev, "model");
- if (!vendor) {
+ if (!model) {
log_message(LOG_WARNING, "%s: no model attribute\n",
scsi_dev->name);
return -1;
retval = get_file_options(vendor, model, &newargc, &newargv);
- optind = 0; /* global extern, reset to 0 */
+ optind = 1; /* reset this global extern */
while (retval == 0) {
- option = getopt_long(newargc, newargv, dev_short_options,
- dev_long_options, &option_ind);
+ option = getopt(newargc, newargv, dev_short_options);
if (option == -1)
break;
}
}
- if (newargv)
+ if (newargv) {
+ free(newargv[0]);
free(newargv);
+ }
return retval;
}
dprintf("%s\n", serial);
retval = 0;
}
- fflush(stdout);
sysfs_close_class_device(scsi_dev);
if (!dev_specified)
strncpy(target_path, sysfs_mnt_path, MAX_NAME_LEN);
strncat(target_path, devpath, MAX_NAME_LEN);
} else {
- if (set_options(argc, argv, short_options, long_options,
- target_path, maj_min_dev) < 0)
+ if (set_options(argc, argv, short_options, target_path,
+ maj_min_dev) < 0)
exit(1);
}
if (retval < 0) {
exit(1);
} else if (newargv && (retval == 0)) {
- if (set_options(newargc, newargv, short_options, long_options,
- target_path, maj_min_dev) < 0)
+ if (set_options(newargc, newargv, short_options, target_path,
+ maj_min_dev) < 0)
exit(1);
free(newargv);
}
~ianmdlvl / elogind.git / blobdiff