Attachment 316124 Details for Bug 461538 – Enable ltrace using /etc/ltrace.d/ for subconfs

[patch] Enable ltrace using /etc/ltrace.d/ for subconfs

ltrace-confd.patch (text/plain), 1.53 KB, created by Milos Jakubicek on 2008-09-08 21:57:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milos Jakubicek

Created: 2008-09-08 21:57:49 UTC

Size: 1.53 KB

patch

obsolete

>--- ltrace-0.5/ltrace.c.orig	2006-02-20 22:48:07.000000000 +0100
>+++ ltrace-0.5/ltrace.c	2008-09-08 23:47:02.000000000 +0200
>@@ -11,6 +11,7 @@
> #include <signal.h>
> #include <sys/wait.h>
> #include <sys/ioctl.h>
>+#include <dirent.h>
> 
> #include "ltrace.h"
> #include "output.h"
>@@ -95,10 +96,27 @@
> 	}
> }
> 
>+int filter(const struct dirent *conffile) {
>+	
>+	char *ext = ".conf";
>+	int i;	
>+	int name_length = strlen(conffile->d_name);
>+	int ext_length = strlen(ext);
>+	
>+	for (i = 0; i < 6; i++) {
>+		if (conffile->d_name[name_length - i] != ext[ext_length - i]) {
>+			return 0;
>+		}
>+	}
>+	return 1;
>+}
>+
> int main(int argc, char **argv)
> {
> 	struct opt_p_t *opt_p_tmp;
> 	char *home;
>+	int conffilecount;
>+	struct dirent **conffiles;
> 
> 	atexit(normal_exit);
> 	signal(SIGINT, signal_exit);	/* Detach processes when interrupted */
>@@ -106,6 +124,27 @@
> 
> 	guess_cols();
> 	argv = process_options(argc, argv);
>+	
>+	conffilecount = scandir(SYSCONFDIR "/ltrace.d", &conffiles, filter, NULL);
>+	if (conffilecount == -1) {
>+		fprintf(stderr, "Error: Couldn't scan " SYSCONFDIR "/ltrace.d\n");
>+		exit(1);
>+	} else {
>+		int i;
>+		char conffilename[PATH_MAX];
>+		if (conffilename == NULL) {
>+			fprintf(stderr, "Error: Not enough memory\n");
>+			exit(1);
>+		}
>+		for (i = 0; i < conffilecount; i++) {
>+			strcpy(conffilename, SYSCONFDIR "/ltrace.d/");
>+			strcat(conffilename, conffiles[i]->d_name);
>+			read_config_file(conffilename);
>+			free(conffiles[i]);
>+		}
>+	}
>+	free(conffiles);
>+
> 	read_config_file(SYSCONFDIR "/ltrace.conf");
> 	home = getenv("HOME");
> 	if (home) {

Actions: View | Diff

Attachments on bug 461538: 316124