[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools mkntfs.c,1.80,1.81

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv17680

Modified Files:
	mkntfs.c 
Log Message:
lingering attribute name problems


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -U2 -r1.80 -r1.81
--- mkntfs.c	11 Jul 2002 16:20:34 -0000	1.80
+++ mkntfs.c	15 Jul 2002 15:09:21 -0000	1.81
@@ -5,5 +5,5 @@
  *
  * Copyright (c) 2000-2002 Anton Altaparmakov.
- * Copyright (C)      2001 Richard Russon.
+ * Copyright (C) 2001-2002 Richard Russon.
  *
  * This utility will create an NTFS 1.2 (Windows NT 4.0) volume on a user
@@ -1227,5 +1227,5 @@
 		}
 	} else
-		uname = NULL;
+		uname = AT_NONAME;
 	/* Check if the attribute is already there. */
 	ctx = ntfs_get_attr_search_ctx(NULL, m);
@@ -1379,5 +1379,5 @@
 	if (ctx)
 		ntfs_put_attr_search_ctx(ctx);
-	if (uname)
+	if (uname && (uname != AT_NONAME))
 		free(uname);
 	if (rl)
@@ -1408,5 +1408,5 @@
 			return -ENAMETOOLONG;
 	} else
-		uname = NULL;
+		uname = AT_NONAME;
 	/* Check if the attribute is already there. */
 	ctx = ntfs_get_attr_search_ctx(NULL, m);
@@ -1481,5 +1481,5 @@
 	if (ctx)
 		ntfs_put_attr_search_ctx(ctx);
-	if (uname)
+	if (uname && (uname != AT_NONAME))
 		free(uname);
 	return err;