From: David Zeuthen <davidz@redhat.com>
Date: Fri, 26 Aug 2011 17:09:41 +0000 (-0400)
Subject: Revert "Fix hang on setting invalid VFAT labels"
X-Git-Tag: upstream/2.1.2~506
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8487b7d0d596e193e8b5ea830e17bd9dc8de0f6c;p=platform%2Fupstream%2Fudisks2.git

Revert "Fix hang on setting invalid VFAT labels"

This reverts commit 8048a1cb8ae2de37c9fe9b07cc28ebafa0de7231.
---

diff --git a/src/helpers/job-change-filesystem-label.c b/src/helpers/job-change-filesystem-label.c
index fcdee76..5017b58 100644
--- a/src/helpers/job-change-filesystem-label.c
+++ b/src/helpers/job-change-filesystem-label.c
@@ -51,7 +51,6 @@ main (int argc,
   char *command_line;
   char *standard_error;
   char *new_label;
-  char *c;
 
   ret = 1;
   command_line = NULL;
@@ -93,16 +92,6 @@ main (int argc,
     {
       if (!validate_and_escape_label (&new_label, 254))
         goto out;
-      /* VFAT does not allow some characters */
-      for (c = "\"*/:<>?\\|"; *c; ++c)
-	{
-	  if (strchr (new_label, *c) != NULL)
-	    {
-	      g_printerr ("character '%c' not supported in VFAT labels\n", *c);
-	      goto out;
-	    }
-          }
-
       g_setenv ("MTOOLS_SKIP_CHECK", "1", TRUE);
       if (strlen (new_label) == 0)
         command_line = g_strdup_printf ("mlabel -c -i %s ::", device);
diff --git a/tests/run b/tests/run
index a25d8d9..e455422 100755
--- a/tests/run
+++ b/tests/run
@@ -736,10 +736,6 @@ class FS(UDisksTestCase):
         # change label
         if supports_label_rename:
             l = 'n"a\m\\"e' + type
-            if type == 'vfat':
-                # VFAT does not support some characters
-                self.assertRaises(dbus.DBusException, iface.FilesystemSetLabel, l)
-                l = "n@a$me"
             iface.FilesystemSetLabel(l)
             self.sync_workaround()
             i = self.get_info()