diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-06-07 09:31:55 +0000 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-06-07 09:31:55 +0000 |
| commit | cedc9241954c05fb027eb432b5695fce03527cfa (patch) | |
| tree | 7524d54a46bcc993902a795338516348a2c93c90 /packages/sysfsutils/sysfsutils-2.1.0 | |
| parent | f45bca043d56ce9bfe3519778a12d41e699c4360 (diff) | |
sysfsutils: update to latest version 2.1.0
* add mnt patch from debian
* reorganize packages
Diffstat (limited to 'packages/sysfsutils/sysfsutils-2.1.0')
| -rw-r--r-- | packages/sysfsutils/sysfsutils-2.1.0/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/sysfsutils/sysfsutils-2.1.0/get_mnt_path_check.patch | 56 |
2 files changed, 56 insertions, 0 deletions
diff --git a/packages/sysfsutils/sysfsutils-2.1.0/.mtn2git_empty b/packages/sysfsutils/sysfsutils-2.1.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sysfsutils/sysfsutils-2.1.0/.mtn2git_empty diff --git a/packages/sysfsutils/sysfsutils-2.1.0/get_mnt_path_check.patch b/packages/sysfsutils/sysfsutils-2.1.0/get_mnt_path_check.patch new file mode 100644 index 0000000000..47f6cafb05 --- /dev/null +++ b/packages/sysfsutils/sysfsutils-2.1.0/get_mnt_path_check.patch @@ -0,0 +1,56 @@ +diff -ruN sysfsutils-2.0.0-old/lib/sysfs_utils.c sysfsutils-2.0.0/lib/sysfs_utils.c +--- sysfsutils-2.0.0-old/lib/sysfs_utils.c 2005-12-07 12:28:18.000000000 +0100 ++++ sysfsutils-2.0.0/lib/sysfs_utils.c 2006-03-06 19:06:11.000000000 +0100 +@@ -22,6 +22,7 @@ + */ + #include "libsysfs.h" + #include "sysfs.h" ++#include <mntent.h> + + /** + * sysfs_remove_trailing_slash: Removes any trailing '/' in the given path +@@ -53,6 +54,9 @@ + { + static char sysfs_path[SYSFS_PATH_MAX] = ""; + const char *sysfs_path_env; ++ FILE *mnt; ++ struct mntent *mntent; ++ int ret; + + if (len == 0 || mnt_path == NULL) + return -1; +@@ -64,12 +68,31 @@ + if (sysfs_path_env != NULL) { + safestrcpymax(mnt_path, sysfs_path_env, len); + sysfs_remove_trailing_slash(mnt_path); +- return 0; ++ } else { ++ safestrcpymax(mnt_path, SYSFS_MNT_PATH, len); + } +- safestrcpymax(mnt_path, SYSFS_MNT_PATH, len); + } + +- return 0; ++ /* check that mount point is indeed mounted */ ++ ret = -1; ++ if ((mnt = setmntent(SYSFS_PROC_MNTS, "r")) == NULL) { ++ dprintf("Error getting mount information\n"); ++ return -1; ++ } ++ while ((mntent = getmntent(mnt)) != NULL) { ++ if (strcmp(mntent->mnt_type, SYSFS_FSTYPE_NAME) == 0 && ++ strcmp(mntent->mnt_dir, mnt_path) == 0) { ++ ret = 0; ++ break; ++ } ++ } ++ ++ endmntent(mnt); ++ ++ if (ret < 0) ++ errno = ENOENT; ++ ++ return ret; + } + + /** |