Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Jan 2015 20:44:17 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r277437 - stable/10/usr.sbin/fstyp
Message-ID:  <201501202044.t0KKiHjB020905@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: trasz
Date: Tue Jan 20 20:44:16 2015
New Revision: 277437
URL: https://svnweb.freebsd.org/changeset/base/277437

Log:
  MFC r277128:
  
  Fix detection of ext2/ext3 filesystems that lack labels.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/fstyp/ext2fs.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/fstyp/ext2fs.c
==============================================================================
--- stable/10/usr.sbin/fstyp/ext2fs.c	Tue Jan 20 20:42:55 2015	(r277436)
+++ stable/10/usr.sbin/fstyp/ext2fs.c	Tue Jan 20 20:44:16 2015	(r277437)
@@ -78,12 +78,6 @@ fstyp_ext2fs(FILE *fp, char *label, size
 	if (s_volume_name[0] == '/')
 		s_volume_name += 1;
 
-	/* Check for volume label */
-	if (s_volume_name[0] == '\0') {
-		free(fs);
-		return (1);
-	}
-
 	strlcpy(label, s_volume_name, size);
 	free(fs);
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501202044.t0KKiHjB020905>