Fix missing headers

[platform/upstream/cryptsetup.git] / lib / utils_devpath.c

diff --git a/lib/utils_devpath.c b/lib/utils_devpath.c
index ded0c04..fc5175c 100644 (file)
--- a/lib/utils_devpath.c
+++ b/lib/utils_devpath.c
@@ -3,11 +3,13 @@
  *
  * Copyright (C) 2004, Christophe Saout <christophe@saout.de>
  * Copyright (C) 2004-2007, Clemens Fruhwirth <clemens@endorphin.org>
- * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2009-2012, Milan Broz
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <string.h>
@@ -24,10 +26,16 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <dirent.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <limits.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include "utils_dm.h"
 
+char *crypt_lookup_dev(const char *dev_id);
+int crypt_sysfs_get_rotational(int major, int minor, int *rotational);
+
 static char *__lookup_dev(char *path, dev_t dev, int dir_level, const int max_level)
 {
        struct dirent *entry;
@@ -129,7 +137,7 @@ char *crypt_lookup_dev(const char *dev_id)
        if (snprintf(path, sizeof(path), "/sys/dev/block/%s", dev_id) < 0)
                return NULL;
 
-       len = readlink(path, link, sizeof(link));
+       len = readlink(path, link, sizeof(link) - 1);
        if (len < 0) {
                /* Without /sys use old scan */
                if (stat("/sys/dev/block", &st) < 0)
@@ -144,7 +152,7 @@ char *crypt_lookup_dev(const char *dev_id)
        devname++;
 
        if (dm_is_dm_kernel_name(devname))
-               devpath = dm_device_path(major, minor);
+               devpath = dm_device_path("/dev/mapper/", major, minor);
        else if (snprintf(path, sizeof(path), "/dev/%s", devname) > 0)
                devpath = strdup(path);
 
@@ -161,3 +169,26 @@ char *crypt_lookup_dev(const char *dev_id)
 
        return devpath;
 }
+
+int crypt_sysfs_get_rotational(int major, int minor, int *rotational)
+{
+       char path[PATH_MAX], tmp[64] = {0};
+       int fd, r;
+
+       if (snprintf(path, sizeof(path), "/sys/dev/block/%d:%d/queue/rotational",
+                    major, minor) < 0)
+               return 0;
+
+       if ((fd = open(path, O_RDONLY)) < 0)
+               return 0;
+       r = read(fd, tmp, sizeof(tmp));
+       close(fd);
+
+       if (r <= 0)
+               return 0;
+
+        if (sscanf(tmp, "%d", rotational) != 1)
+               return 0;
+
+       return 1;
+}