From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 30 Mar 2008 18:03:51 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.41-WIP-0427~46
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=a70f10dbc493c4eae488cadd8512e873220037d9;p=tools%2Fe2fsprogs.git

Merge branch 'maint'
---

a70f10dbc493c4eae488cadd8512e873220037d9
diff --cc e2fsck/unix.c
index 7b662e4,d3a8a2b..deec442
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@@ -732,8 -737,22 +736,8 @@@ static errcode_t PRS(int argc, char *ar
  			break;
  #endif
  		case 'N':
- 			ctx->device_name = optarg;
+ 			ctx->device_name = string_copy(ctx, optarg, 0);
  			break;
 -#ifdef ENABLE_SWAPFS
 -		case 's':
 -			normalize_swapfs = 1;
 -		case 'S':
 -			swapfs = 1;
 -			break;
 -#else
 -		case 's':
 -		case 'S':
 -			fprintf(stderr, _("Byte-swapping filesystems "
 -					  "not compiled in this version "
 -					  "of e2fsck\n"));
 -			exit(1);
 -#endif
  		case 'k':
  			keep_bad_blocks++;
  			break;