[maemo-commits] [maemo-commits] r18784 - in projects/haf/trunk/ke-recv: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-06-23 14:43:18 +0300 (Tue, 23 Jun 2009)
New Revision: 18784

Modified:
   projects/haf/trunk/ke-recv/debian/changelog
   projects/haf/trunk/ke-recv/src/events.c
   projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh
Log:
remove dosfsck run before mount;  fix coverity issues


Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2009-06-23 11:42:12 UTC (rev 18783)
+++ projects/haf/trunk/ke-recv/debian/changelog	2009-06-23 11:43:18 UTC (rev 18784)
@@ -4,6 +4,8 @@
     memory is full
   * Changes for the new USB handling architecture.
   * Reduce some syslog spam.
+  * Fix bugs in previous Coverity fixes.
+  * Fixes: NB#122833 - dosfsck should be removed from device mount
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 10 Jun 2009 09:47:20 +0300
 

Modified: projects/haf/trunk/ke-recv/src/events.c
===================================================================
--- projects/haf/trunk/ke-recv/src/events.c	2009-06-23 11:42:12 UTC (rev 18783)
+++ projects/haf/trunk/ke-recv/src/events.c	2009-06-23 11:43:18 UTC (rev 18784)
@@ -87,6 +87,7 @@
                 strncpy(mmc->display_name,
                         (const char*)dgettext("hildon-fm",
                          "sfil_li_memorycard_removable"), 100);
+                mmc->display_name[99] = '\0';
         }
 }
 
@@ -155,6 +156,7 @@
                         set_localised_label(mmc);
                 } else {
                         strncpy(mmc->display_name, (const char*)buf, 100);
+                        mmc->display_name[99] = '\0';
                 }
         }
         g_free(buf);

Modified: projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh
===================================================================
--- projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh	2009-06-23 11:42:12 UTC (rev 18783)
+++ projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh	2009-06-23 11:43:18 UTC (rev 18784)
@@ -54,18 +54,18 @@
 fi
 
 # time limited check
-/sbin/dosfsck -I -n -T 10 $PDEV
-if [ $? != 0 ]; then
-  logger "$0: $PDEV is corrupt, trying to mount it read-only"
-  mmc-mount $PDEV $MP ro
-  if [ $? = 0 ]; then
-    logger "$0: $PDEV mounted read-only"
-    exit 2
-  else
-    logger "$0: Couldn't mount $PDEV read-only"
-    exit 1
-  fi
-fi
+#/sbin/dosfsck -I -n -T 10 $PDEV
+#if [ $? != 0 ]; then
+#  logger "$0: $PDEV is corrupt, trying to mount it read-only"
+#  mmc-mount $PDEV $MP ro
+#  if [ $? = 0 ]; then
+#    logger "$0: $PDEV mounted read-only"
+#    exit 2
+#  else
+#    logger "$0: Couldn't mount $PDEV read-only"
+#    exit 1
+#  fi
+#fi
 
 mmc-mount $PDEV $MP rw
 RC=$?