static int open_logfile (const char *pathname)
{
- return open(pathname, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR);
+ return open(pathname, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);
}
static void rotate_logs()
static void setup_output()
{
- if (g_output_filename == NULL) {
- g_outfd = STDOUT_FILENO;
-
- } else {
- struct stat statbuf;
-
- g_outfd = open_logfile (g_output_filename);
+ if (g_output_filename == NULL) {
+ g_outfd = STDOUT_FILENO;
- if (g_outfd < 0) {
- perror ("couldn't open output file");
- exit(-1);
- }
+ } else {
+ struct stat statbuf;
- fstat(g_outfd, &statbuf);
+ g_outfd = open_logfile (g_output_filename);
- g_out_byte_count = statbuf.st_size;
- }
+ if (g_outfd < 0) {
+ perror ("couldn't open output file");
+ exit(-1);
+ }
+ if (fstat(g_outfd, &statbuf) == -1)
+ g_out_byte_count = 0;
+ else
+ g_out_byte_count = statbuf.st_size;
+ }
}
static int set_log_format(const char * formatString)
" -r [<kbytes>] Rotate log every kbytes. (16 if unspecified). Requires -f\n"
" -n <count> Sets max number of rotated logs to <count>, default 4\n"
" -v <format> Sets the log print format, where <format> is one of:\n\n"
- " brief process tag thread raw time threadtime long\n\n"
- " -c clear (flush) the entire log and exit\n"
+ " brief(by default) process tag thread raw time threadtime long\n\n"
+ " -c clear (flush) the entire log and exit, conflicts with '-g'\n"
" -d dump the log and then exit (don't block)\n"
" -t <count> print only the most recent <count> lines (implies -d)\n"
- " -g get the size of the log's ring buffer and exit\n"
+ " -g get the size of the log's ring buffer and exit, conflicts with '-c'\n"
" -b <buffer> request alternate ring buffer\n"
" ('main' (default), 'radio', 'system')");
" E Error\n"
" F Fatal\n"
" S Silent (supress all output)\n"
- "\n'*' means '*:d' and <tag> by itself means <tag>:v\n"
- "If no filterspec is found, filter defaults to '*:I'\n"
- "\nIf not specified with -v, format is set defaults to \"brief\"\n\n");
+ "\n'*' means '*:D' and <tag> by itself means <tag>:V\n"
+ "If no filterspec is found, filter defaults to '*:I'\n\n");
+}
+
+
+/*
+ * free one log_device_t and it doesn't take care of chain so it
+ * may break the chain list
+ */
+static void log_devices_free(struct log_device_t *dev)
+{
+ if (!dev)
+ return;
+
+ if (dev->device)
+ free(dev->device);
+
+ if (dev->queue) {
+ while (dev->queue->next) {
+ struct queued_entry_t *tmp = dev->queue->next;
+ dev->queue->next = tmp->next;
+ free(tmp);
+ }
+ free(dev->queue);
+ }
+ free(dev);
+ dev = NULL;
+}
+
+
+/*
+ * free all the nodes after the "dev" and includes itself
+ */
+static void log_devices_chain_free(struct log_device_t *dev)
+{
+ if (!dev)
+ return;
+
+ while (dev->next) {
+ struct log_device_t *tmp = dev->next;
+ dev->next = tmp->next;
+ log_devices_free(tmp);
+ }
+
+ log_devices_free(dev);
+ dev = NULL;
+}
+
+
+/*
+ * create a new log_device_t instance but don't care about
+ * the device node accessable or not
+ */
+static struct log_device_t *log_devices_new(const char *path)
+{
+ struct log_device_t *new;
+
+ if (!path || strlen(path) <= 0)
+ return NULL;
+
+ new = malloc(sizeof(*new));
+ if (!new) {
+ fprintf(stderr, "out of memory\n");
+ return NULL;
+ }
+ new->device = strdup(path);
+ new->fd = -1;
+ new->printed = false;
+ new->queue = NULL;
+ new->next = NULL;
+ return new;
}
+/*
+ * add a new device to the tail of chain
+ */
+static int log_devices_add_to_tail(struct log_device_t *devices, struct log_device_t *new)
+{
+ struct log_device_t *tail = devices;
+
+ if (!devices || !new)
+ return -1;
+
+ while (tail->next)
+ tail = tail->next;
+
+ tail->next = new;
+ g_dev_count++;
+
+ return 0;
+}
+
int main(int argc, char **argv)
{
int err;
break;
case 'b': {
- char* buf = (char*) malloc(strlen(LOG_FILE_DIR) + strlen(optarg) + 1);
- if (buf == NULL) {
- fprintf(stderr,"Can't malloc LOG_FILE_DIR\n");
+ char *buf;
+ if (asprintf(&buf, LOG_FILE_DIR "%s", optarg) == -1) {
+ asprintf(stderr,"Can't malloc LOG_FILE_DIR\n");
exit(-1);
}
- strcpy(buf, LOG_FILE_DIR);
- strcat(buf, optarg);
- // snprintf(buf, strlen(LOG_FILE_DIR) + strlen(optarg) + 1, "%s%s", LOG_FILE_DIR, optarg);
+ dev = log_devices_new(buf);
if (devices) {
- dev = devices;
- while (dev->next) {
- dev = dev->next;
- }
- dev->next = (struct log_device_t *)malloc( sizeof(struct log_device_t));
- if (dev->next == NULL) {
- fprintf(stderr,"Can't malloc log_device\n");
+ if (log_devices_add_to_tail(devices, dev)) {
+ fprintf(stderr, "Open log device %s failed\n", buf);
exit(-1);
}
- dev->next->device = buf;
- dev->next->fd = -1;
- dev->next->printed = false;
- dev->next->queue = NULL;
- dev->next->next = NULL;
-
} else {
- devices = (struct log_device_t *)malloc( sizeof(struct log_device_t));
- if (devices == NULL) {
- fprintf(stderr,"Can't malloc log_device\n");
- exit(-1);
- }
- devices->device = buf;
- devices->fd = -1;
- devices->printed = false;
- devices->queue = NULL;
- devices->next = NULL;
+ devices = dev;
+ g_dev_count = 1;
}
- g_dev_count++;
}
break;
}
}
+ /* get log size conflicts with write mode */
+ if (getLogSize && mode != O_RDONLY) {
+ show_help(argv[0]);
+ exit(-1);
+ }
+
if (!devices) {
- devices = (struct log_device_t *)malloc( sizeof(struct log_device_t));
+ devices = log_devices_new("/dev/"LOGGER_LOG_MAIN);
if (devices == NULL) {
- fprintf(stderr,"Can't malloc log_device\n");
+ fprintf(stderr,"Can't add log device: %s\n", LOGGER_LOG_MAIN);
exit(-1);
}
- devices->device = strdup("/dev/"LOGGER_LOG_MAIN);
- devices->fd = -1;
- devices->printed = false;
- devices->queue = NULL;
- devices->next = NULL;
g_dev_count = 1;
-
int accessmode =
- (mode & O_RDONLY) ? R_OK : 0
- | (mode & O_WRONLY) ? W_OK : 0;
+ (mode == O_RDONLY) ? R_OK : 0
+ | (mode == O_WRONLY) ? W_OK : 0;
- // only add this if it's available
+ // only add this if it's available
if (0 == access("/dev/"LOGGER_LOG_SYSTEM, accessmode)) {
- devices->next = (struct log_device_t *)malloc( sizeof(struct log_device_t));
- if (devices->next == NULL) {
- fprintf(stderr,"Can't malloc log_device\n");
+ if (log_devices_add_to_tail(devices, log_devices_new("/dev/"LOGGER_LOG_SYSTEM))) {
+ fprintf(stderr,"Can't add log device: %s\n", LOGGER_LOG_SYSTEM);
exit(-1);
}
- devices->next->device = strdup("/dev/"LOGGER_LOG_SYSTEM);
- devices->next->fd = -1;
- devices->next->printed = false;
- devices->next->queue = NULL;
- devices->next->next = NULL;
- g_dev_count ++;
}
+
if (0 == access("/dev/"LOGGER_LOG_APPS, accessmode)) {
- devices->next = (struct log_device_t *)malloc( sizeof(struct log_device_t));
- if (devices->next == NULL) {
- fprintf(stderr,"Can't malloc log_device\n");
+ if (log_devices_add_to_tail(devices, log_devices_new("/dev/"LOGGER_LOG_APPS))) {
+ fprintf(stderr,"Can't add log device: %s\n", LOGGER_LOG_APPS);
exit(-1);
}
- devices->next->device = strdup("/dev/"LOGGER_LOG_APPS);
- devices->next->fd = -1;
- devices->next->printed = false;
- devices->next->queue = NULL;
- devices->next->next = NULL;
- g_dev_count ++;
}
/*
// only add this if it's available
read_log_lines(devices);
+ log_devices_chain_free(devices);
+
return 0;
}
projects / framework / system / dlog.git / blobdiff