aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-03-18 01:44:52 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-03-18 01:44:52 +0000
commit6aa7696e280181cd87f7569ce65696b760dca891 (patch)
tree4f52aa69b250f0d1b704dc10085a060795229c39
parent2a7a4513918fef3bbf3d665ea0871dfc555d6692 (diff)
downloadbusybox-w32-6aa7696e280181cd87f7569ce65696b760dca891.tar.gz
busybox-w32-6aa7696e280181cd87f7569ce65696b760dca891.tar.bz2
busybox-w32-6aa7696e280181cd87f7569ce65696b760dca891.zip
mount: #ifdef out MOUNT_LABEL code parts if it is not selected
-rw-r--r--util-linux/mount.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index d4a320756..bd5f27b2e 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -22,8 +22,10 @@
22#include <syslog.h> 22#include <syslog.h>
23#include "libbb.h" 23#include "libbb.h"
24 24
25#if ENABLE_FEATURE_MOUNT_LABEL
25/* For FEATURE_MOUNT_LABEL only */ 26/* For FEATURE_MOUNT_LABEL only */
26#include "volume_id.h" 27#include "volume_id.h"
28#endif
27 29
28/* Needed for nfs support only */ 30/* Needed for nfs support only */
29#include <sys/utsname.h> 31#include <sys/utsname.h>
@@ -252,10 +254,12 @@ static int resolve_mount_spec(char **fsname)
252{ 254{
253 char *tmp = NULL; 255 char *tmp = NULL;
254 256
257#if ENABLE_FEATURE_MOUNT_LABEL
255 if (!strncmp(*fsname, "UUID=", 5)) 258 if (!strncmp(*fsname, "UUID=", 5))
256 tmp = get_devname_from_uuid(*fsname + 5); 259 tmp = get_devname_from_uuid(*fsname + 5);
257 else if (!strncmp(*fsname, "LABEL=", 6)) 260 else if (!strncmp(*fsname, "LABEL=", 6))
258 tmp = get_devname_from_label(*fsname + 6); 261 tmp = get_devname_from_label(*fsname + 6);
262#endif
259 263
260 if (tmp) { 264 if (tmp) {
261 *fsname = tmp; 265 *fsname = tmp;