Cluster Project branch, master, updated. cluster-2.99.00-27-gde09a3c

fabbione@sourceware.org fabbione@sourceware.org
Wed May 7 11:09:00 GMT 2008


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=de09a3c352c5c5bb9dcc4e63d22a38c23798b4ea

The branch, master has been updated
       via  de09a3c352c5c5bb9dcc4e63d22a38c23798b4ea (commit)
      from  b2dc0aada45c7743145d8deeea0d147223d9409d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit de09a3c352c5c5bb9dcc4e63d22a38c23798b4ea
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Wed May 7 13:05:25 2008 +0200

    [MISC] Fix some gfs2 build warnings
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 gfs2/libgfs2/gfs2_log.c |    5 ++++-
 gfs2/mkfs/main_mkfs.c   |    3 ++-
 gfs2/mount/mtab.c       |    5 ++++-
 gfs2/tool/sb.c          |    3 ++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/gfs2/libgfs2/gfs2_log.c b/gfs2/libgfs2/gfs2_log.c
index 8103a62..8dd55a2 100644
--- a/gfs2/libgfs2/gfs2_log.c
+++ b/gfs2/libgfs2/gfs2_log.c
@@ -132,7 +132,10 @@ char generic_interrupt(const char *caller, const char *where,
 			log_debug("Error in select() on stdin\n");
 			break;
 		}
-		read(STDIN_FILENO, &response, sizeof(char));
+		if(read(STDIN_FILENO, &response, sizeof(char)) < 0) {
+			log_debug("Error in read() on stdin\n");
+			break;
+		}
 	}
 	while (TRUE) {
 		printf("\n%s interrupted during %s:  ", caller, where);
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index 3749b0f..074121f 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -274,7 +274,8 @@ static void are_you_sure(struct gfs2_sbd *sdp)
 			   vid->usage_id == VOLUME_ID_OTHER? "partition" : vid->usage);
 	volume_id_close(vid);
 	printf("\nAre you sure you want to proceed? [y/n] ");
-	fgets(input, 32, stdin);
+	if(!fgets(input, 32, stdin))
+		die("unable to read from stdin\n");
 
 	if (input[0] != 'y')
 		die("aborted\n");
diff --git a/gfs2/mount/mtab.c b/gfs2/mount/mtab.c
index 21b0c8c..7df402a 100644
--- a/gfs2/mount/mtab.c
+++ b/gfs2/mount/mtab.c
@@ -172,7 +172,10 @@ void del_mtab_entry(struct mount_options *mo)
 		int e = errno;
 		warn("error stating /etc/mtab: %s", strerror(e));
 	} else
-		chown("/etc/mtab.tmp", sbuf.st_uid, sbuf.st_gid);
+		if(chown("/etc/mtab.tmp", sbuf.st_uid, sbuf.st_gid) < 0) {
+			int e = errno;
+			warn("error changing owner of /etc/mtab.tmp: %s", strerror(e));
+		}
 
 	fclose(mtmp);
 	fclose(mtab);
diff --git a/gfs2/tool/sb.c b/gfs2/tool/sb.c
index dbb1a4b..49e896d 100644
--- a/gfs2/tool/sb.c
+++ b/gfs2/tool/sb.c
@@ -81,7 +81,8 @@ do_sb(int argc, char **argv)
 	if (newval && !override) {
 		printf("You shouldn't change any of these values if the filesystem is mounted.\n");
 		printf("\nAre you sure? [y/n] ");
-		fgets((char*)input, 255, stdin);
+		if(!fgets((char*)input, 255, stdin))
+			die("unable to read from stdin\n");
 
 		if (input[0] != 'y')
 			die("aborted\n");


hooks/post-receive
--
Cluster Project



More information about the Cluster-cvs mailing list