Attachment 155747 Details for Bug 234249 – Patch fixed based on fabbione's comments

[patch] Patch fixed based on fabbione's comments

rgmanager-234249-rhel4.patch (text/plain), 1.69 KB, created by Lon Hohberger on 2007-05-30 20:31:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2007-05-30 20:31:13 UTC

Size: 1.69 KB

patch

obsolete

>Index: resrules.c
>===================================================================
>RCS file: /cvs/cluster/cluster/rgmanager/src/daemons/resrules.c,v
>retrieving revision 1.9.2.7
>diff -u -r1.9.2.7 resrules.c
>--- resrules.c	20 Mar 2007 19:40:06 -0000	1.9.2.7
>+++ resrules.c	30 May 2007 20:30:35 -0000
>@@ -307,7 +307,7 @@
> 	for (x = 0; acts[x].ra_name; x++) {
> 		if (!strcmp(acts[x].ra_name, name) &&
> 		    (depth == acts[x].ra_depth || depth == -1)) {
>-			printf("Replacing action '%s' depth %d: ",
>+			fprintf(stderr, "Replacing action '%s' depth %d: ",
> 			       name, acts[x].ra_depth);
> 			if (timeout >= 0) {
> 				printf("timeout: %d->%d ",
>@@ -1093,7 +1093,7 @@
> {
> 	DIR *dir;
> 	struct dirent *de;
>-	char *fn;//, *dot;
>+	char *fn, *dot;
> 	char path[2048];
> 
> 	dir = opendir(rpath);
>@@ -1107,14 +1107,40 @@
> 		if (!fn)
> 			continue;
> 		
>+		/* Ignore files with common backup extension */
> 		if ((fn != NULL) && (strlen(fn) > 0) && 
> 			(fn[strlen(fn)-1] == '~')) 
> 			continue;
> 
>+		/* Ignore hidden files */
>+		if (*fn == '.')
>+			continue;
>+
>+		dot = strrchr(fn, '.');
>+		if (dot) {
>+			/* Ignore RPM installed save files, patches,
>+			   diffs, etc. */
>+			if (!strncasecmp(dot, ".rpm", 4)) {
>+				fprintf(stderr, "Warning: "
>+					"Ignoring %s/%s: Bad extension %s\n",
>+					rpath, de->d_name, dot);
>+				continue;
>+			}
>+		}
>+
> 		snprintf(path, sizeof(path), "%s/%s",
> 			 rpath, de->d_name);
> 
>-		load_resource_rulefile(path, rules);
>+		if (stat(path, &st_buf) < 0)
>+			continue;
>+
>+		if (S_ISDIR(st_buf.st_mode))
>+			continue;
>+
>+ 		if (st_buf.st_mode & (S_IXUSR|S_IXOTH|S_IXGRP)) {
>+ 			printf("Loading resource rule from %s\n", path);
>+  			load_resource_rulefile(path, rules);
>+ 		}
> 	}
> 	xmlCleanupParser();
>

Actions: View | Diff

Attachments on bug 234249: 155696 | 155698 | 155699 | 155700 | 155747 | 155748