Removed remaining hard-coded paths

Change-Id: I3c386d0e37614754d8af35bad15c740204d25b68

diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c
index bc86246..22f112d 100644 (file)
--- a/src/bin/e_fm/e_fm_main_eeze.c
+++ b/src/bin/e_fm/e_fm_main_eeze.c
@@ -112,10 +112,8 @@ _e_fm_main_eeze_mount_point_set(E_Volume *v)
         eeze_disk_mount_point_set(v->disk, NULL);
         return;
      }
-   /* here we arbitrarily mount everything to /media/$devnode regardless of fstab */
    eina_stringshare_del(v->mount_point);
-   snprintf(path, sizeof(path), "/media%s", str);
-   v->mount_point = _mount_point_escape(path);
+   v->mount_point = _mount_point_escape(str);
    eeze_disk_mount_point_set(v->disk, v->mount_point);
 }
 
@@ -366,7 +364,7 @@ _e_fm_main_eeze_volume_add(const char *syspath,
    if ((type == EEZE_DISK_TYPE_INTERNAL) || (type == EEZE_DISK_TYPE_UNKNOWN))
      {
         str = eeze_disk_mount_point_get(v->disk);
-        if ((type != EEZE_DISK_TYPE_INTERNAL) || (str && (strncmp(str, "/media/", 7))))
+        if ((type != EEZE_DISK_TYPE_INTERNAL) || str)
           {
              INF("VOL is %s, ignoring", (type == EEZE_DISK_TYPE_INTERNAL) ? "internal" : "unknown");
              eeze_disk_free(v->disk);

diff --git a/src/bin/e_fm_device.c b/src/bin/e_fm_device.c
index 1e166c5..a5f6aa7 100644 (file)
--- a/src/bin/e_fm_device.c
+++ b/src/bin/e_fm_device.c
@@ -414,15 +414,15 @@ e_fm2_device_volume_mountpoint_get(E_Volume *v)
      return NULL;
 
    if (v->label && v->label[0] != '\0')
-     snprintf(buf, sizeof(buf) - 1, "/media/%s", v->label);
+     snprintf(buf, sizeof(buf) - 1, "%s", v->label);
    else if (v->uuid && v->uuid[0] != '\0')
-     snprintf(buf, sizeof(buf) - 1, "/media/%s", v->uuid);
+     snprintf(buf, sizeof(buf) - 1, "%s", v->uuid);
    else if ((v->storage) && (v->storage->serial) && v->storage->serial[0] != '\0')
-     snprintf(buf, sizeof(buf) - 1, "/media/%s", v->storage->serial);
+     snprintf(buf, sizeof(buf) - 1, "%s", v->storage->serial);
    else
      {
         static int mount_count = 1;
-        snprintf(buf, sizeof(buf) - 1, "/media/unknown-%i", mount_count++);
+        snprintf(buf, sizeof(buf) - 1, "unknown-%i", mount_count++);
      }
 //   printf("GET MOUNTPOINT = %s\n", buf);
    return eina_stringshare_add(buf);

diff --git a/src/bin/e_sys_main.c b/src/bin/e_sys_main.c
index 79f30ef..1af6311 100644 (file)
--- a/src/bin/e_sys_main.c
+++ b/src/bin/e_sys_main.c
@@ -303,21 +303,21 @@ main(int argc,
              struct stat s;
 
              mp = argv[5];
-             if (stat("/media", &s))
+             if (stat("media", &s))
                {
                   mode_t um;
 
                   um = umask(0);
-                  if (mkdir("/media", S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH))
+                  if (mkdir("media", S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH))
                     {
-                       printf("ERROR: COULD NOT CREATE DIRECTORY /media\n");
+                       printf("ERROR: COULD NOT CREATE DIRECTORY media\n");
                        exit(40);
                     }
                   umask(um);
                }
              else if (!S_ISDIR(s.st_mode))
                {
-                  printf("ERROR: NOT A DIRECTORY: /media\n");
+                  printf("ERROR: NOT A DIRECTORY: media\n");
                   exit(40);
                }
 
@@ -354,7 +354,7 @@ main(int argc,
 
              mp = strrchr(argv[2], '/');
              if (!mp) return ret;
-             snprintf(path, sizeof(path), "/media%s", mp);
+             snprintf(path, sizeof(path), "media%s", mp);
              if (stat(path, &st)) return ret;
              if (!S_ISDIR(st.st_mode)) return ret;
              it = eina_file_ls(path);
@@ -457,7 +457,7 @@ mount_args_check(int argc, char **argv, const char *action)
    if (!strcmp(action, "mount"))
      {
         /* will ALWAYS be:
-           /path/to/mount -o nosuid,uid=XYZ,[utf8,] UUID=XXXX-XXXX[-XXXX-XXXX] /media/$devnode
+           /path/to/mount -o nosuid,uid=XYZ,[utf8,] UUID=XXXX-XXXX[-XXXX-XXXX] media/$devnode
          */
         if (argc != 6) return EINA_FALSE;
         if (argv[2][0] == '-')
@@ -499,7 +499,7 @@ mount_args_check(int argc, char **argv, const char *action)
         /* this is good, but it prevents umounting user-mounted removable media;
          * need to figure out a better way...
          *
-           snprintf(buf, sizeof(buf), "/media%s", node);
+           snprintf(buf, sizeof(buf), "media%s", node);
            if (stat(buf, &st)) return EINA_FALSE;
            if (!S_ISDIR(st.st_mode)) return EINA_FALSE;
          */