X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_mount.c;h=d303677d4e6b0f88b2153fcd85b17a5ab50b7f3a;hb=eae3f57d9a826e015ef952c746675c2aff8592dc;hp=0e1a5c9c3565e9e899fa6c02bb40ba59c2bf191e;hpb=9e7918de3468233376be0cb0c7c7ab5a06ef8bce;p=collectd.git diff --git a/src/utils_mount.c b/src/utils_mount.c index 0e1a5c9c..d303677d 100644 --- a/src/utils_mount.c +++ b/src/utils_mount.c @@ -12,27 +12,27 @@ * ranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public Licence for more details. * - * You should have received a copy of the GNU General Public - * Licence along with this program; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, - * USA. + * 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., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Author: * Niki W. Waibel **/ #if HAVE_CONFIG_H -# include +# include "config.h" #endif -#include "common.h" #if HAVE_XFS_XQM_H +# define _GNU_SOURCE # include #define XFS_SUPER_MAGIC_STR "XFSB" #define XFS_SUPER_MAGIC2_STR "BSFX" #endif -#include "utils_debug.h" +#include "common.h" +#include "plugin.h" #include "utils_mount.h" #if HAVE_GETVFSSTAT @@ -260,7 +260,7 @@ uuidcache_init(void) * (This is useful, if the cdrom on /dev/hdc must not * be accessed.) */ - snprintf(device, sizeof(device), "%s/%s", + ssnprintf(device, sizeof(device), "%s/%s", DEVLABELDIR, ptname); if(!get_label_uuid(device, &label, uuid)) { uuidcache_addentry(sstrdup(device), @@ -334,7 +334,7 @@ get_spec_by_uuid(const char *s) return get_spec_by_x(UUID, uuid); bad_uuid: - DBG("Found an invalid UUID: %s", s); + DEBUG("utils_mount: Found an invalid UUID: %s", s); return NULL; } @@ -353,12 +353,12 @@ static char *get_device_name(const char *optstr) } else if (strncmp (optstr, "UUID=", 5) == 0) { - DBG ("TODO: check UUID= code!"); + DEBUG ("utils_mount: TODO: check UUID= code!"); rc = get_spec_by_uuid (optstr + 5); } else if (strncmp (optstr, "LABEL=", 6) == 0) { - DBG ("TODO: check LABEL= code!"); + DEBUG ("utils_mount: TODO: check LABEL= code!"); rc = get_spec_by_volume_label (optstr + 6); } else @@ -368,7 +368,7 @@ static char *get_device_name(const char *optstr) if(!rc) { - DBG ("Error checking device name: optstr = %s", optstr); + DEBUG ("utils_mount: Error checking device name: optstr = %s", optstr); } return rc; } @@ -383,7 +383,11 @@ static cu_mount_t *cu_mount_listmntent (void) struct tabmntent *mntlist; if(listmntent(&mntlist, COLLECTD_MNTTAB, NULL, NULL) < 0) { - DBG("calling listmntent() failed: %s", strerror(errno)); +#if COLLECT_DEBUG + char errbuf[1024]; + DEBUG("utils_mount: calling listmntent() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); +#endif /* COLLECT_DEBUG */ } for(p = mntlist; p; p = p->next) { @@ -394,7 +398,7 @@ static cu_mount_t *cu_mount_listmntent (void) if(loop == NULL) { /* no loop= mount */ device = get_device_name(mnt->mnt_fsname); if(device == NULL) { - DBG("can't get devicename for fs (%s) %s (%s)" + DEBUG("utils_mount: can't get devicename for fs (%s) %s (%s)" ": ignored", mnt->mnt_type, mnt->mnt_dir, mnt->mnt_fsname); continue; @@ -428,16 +432,16 @@ static cu_mount_t *cu_mount_listmntent (void) #elif HAVE_GETVFSSTAT || HAVE_GETFSSTAT static cu_mount_t *cu_mount_getfsstat (void) { -#if HAVE_GETVFSSTAT -# define STRUCT_STATFS struct statvfs -# define CMD_STATFS getvfsstat -# define FLAGS_STATFS ST_NOWAIT -/* #endif HAVE_GETVFSSTAT */ -#elif HAVE_GETFSSTAT +#if HAVE_GETFSSTAT # define STRUCT_STATFS struct statfs # define CMD_STATFS getfsstat # define FLAGS_STATFS MNT_NOWAIT -#endif /* HAVE_GETFSSTAT */ +/* #endif HAVE_GETFSSTAT */ +#elif HAVE_GETVFSSTAT +# define STRUCT_STATFS struct statvfs +# define CMD_STATFS getvfsstat +# define FLAGS_STATFS ST_NOWAIT +#endif /* HAVE_GETVFSSTAT */ int bufsize; STRUCT_STATFS *buf; @@ -452,7 +456,11 @@ static cu_mount_t *cu_mount_getfsstat (void) /* Get the number of mounted file systems */ if ((bufsize = CMD_STATFS (NULL, 0, FLAGS_STATFS)) < 1) { - DBG ("getv?fsstat failed: %s", strerror (errno)); +#if COLLECT_DEBUG + char errbuf[1024]; + DEBUG ("utils_mount: getv?fsstat failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); +#endif /* COLLECT_DEBUG */ return (NULL); } @@ -465,7 +473,11 @@ static cu_mount_t *cu_mount_getfsstat (void) * manpage.. -octo */ if ((num = CMD_STATFS (buf, bufsize * sizeof (STRUCT_STATFS), FLAGS_STATFS)) < 1) { - DBG ("getv?fsstat failed: %s", strerror (errno)); +#if COLLECT_DEBUG + char errbuf[1024]; + DEBUG ("utils_mount: getv?fsstat failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); +#endif /* COLLECT_DEBUG */ free (buf); return (NULL); } @@ -514,11 +526,13 @@ static cu_mount_t *cu_mount_gen_getmntent (void) cu_mount_t *last = NULL; cu_mount_t *new = NULL; - DBG ("(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB); + DEBUG ("utils_mount: (void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB); if ((fp = fopen (COLLECTD_MNTTAB, "r")) == NULL) { - syslog (LOG_ERR, "fopen (%s): %s", COLLECTD_MNTTAB, strerror (errno)); + char errbuf[1024]; + ERROR ("fopen (%s): %s", COLLECTD_MNTTAB, + sstrerror (errno, errbuf, sizeof (errbuf))); return (NULL); } @@ -559,6 +573,64 @@ static cu_mount_t *cu_mount_gen_getmntent (void) #warn "This version of `getmntent' hat not yet been implemented!" /* #endif HAVE_SEQ_GETMNTENT */ +#elif HAVE_GETMNTENT_R +static cu_mount_t *cu_mount_getmntent (void) +{ + FILE *fp; + struct mntent me; + char mntbuf[1024]; + + cu_mount_t *first = NULL; + cu_mount_t *last = NULL; + cu_mount_t *new = NULL; + + DEBUG ("utils_mount: (void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB); + + if ((fp = setmntent (COLLECTD_MNTTAB, "r")) == NULL) + { + char errbuf[1024]; + ERROR ("setmntent (%s): %s", COLLECTD_MNTTAB, + sstrerror (errno, errbuf, sizeof (errbuf))); + return (NULL); + } + + while (getmntent_r (fp, &me, mntbuf, sizeof (mntbuf) )) + { + if ((new = malloc (sizeof (cu_mount_t))) == NULL) + break; + memset (new, '\0', sizeof (cu_mount_t)); + + /* Copy values from `struct mntent *' */ + new->dir = sstrdup (me.mnt_dir); + new->spec_device = sstrdup (me.mnt_fsname); + new->type = sstrdup (me.mnt_type); + new->options = sstrdup (me.mnt_opts); + new->device = get_device_name (new->options); + new->next = NULL; + + DEBUG ("utils_mount: new = {dir = %s, spec_device = %s, type = %s, options = %s, device = %s}", + new->dir, new->spec_device, new->type, new->options, new->device); + + /* Append to list */ + if (first == NULL) + { + first = new; + last = new; + } + else + { + last->next = new; + last = new; + } + } + + endmntent (fp); + + DEBUG ("utils_mount: return (0x%p)", (void *) first); + + return (first); +} /* HAVE_GETMNTENT_R */ + #elif HAVE_ONE_GETMNTENT static cu_mount_t *cu_mount_getmntent (void) { @@ -569,11 +641,13 @@ static cu_mount_t *cu_mount_getmntent (void) cu_mount_t *last = NULL; cu_mount_t *new = NULL; - DBG ("(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB); + DEBUG ("utils_mount: (void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB); if ((fp = setmntent (COLLECTD_MNTTAB, "r")) == NULL) { - syslog (LOG_ERR, "setmntent (%s): %s", COLLECTD_MNTTAB, strerror (errno)); + char errbuf[1024]; + ERROR ("setmntent (%s): %s", COLLECTD_MNTTAB, + sstrerror (errno, errbuf, sizeof (errbuf))); return (NULL); } @@ -591,7 +665,7 @@ static cu_mount_t *cu_mount_getmntent (void) new->device = get_device_name (new->options); new->next = NULL; - DBG ("new = {dir = %s, spec_device = %s, type = %s, options = %s, device = %s}", + DEBUG ("utils_mount: new = {dir = %s, spec_device = %s, type = %s, options = %s, device = %s}", new->dir, new->spec_device, new->type, new->options, new->device); /* Append to list */ @@ -609,7 +683,7 @@ static cu_mount_t *cu_mount_getmntent (void) endmntent (fp); - DBG ("return (0x%p)", (void *) first); + DEBUG ("utils_mount: return (0x%p)", (void *) first); return (first); } @@ -643,11 +717,11 @@ cu_mount_t *cu_mount_getlist(cu_mount_t **list) #elif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT new = cu_mount_gen_getmntent (); #elif HAVE_SEQ_GETMNTENT -# warn "This version of `getmntent' hat not yet been implemented!" +# error "This version of `getmntent' hat not yet been implemented!" #elif HAVE_ONE_GETMNTENT new = cu_mount_getmntent (); #else - new = NULL; +# error "Could not determine how to find mountpoints." #endif if (first != NULL) @@ -672,8 +746,6 @@ void cu_mount_freelist (cu_mount_t *list) cu_mount_t *this; cu_mount_t *next; - DBG ("(list = 0x%p)", (void *) list); - for (this = list; this != NULL; this = next) { next = this->next; @@ -690,13 +762,13 @@ void cu_mount_freelist (cu_mount_t *list) char * cu_mount_checkoption(char *line, char *keyword, int full) { - char *line2, *l2; - int l = strlen(keyword); - char *p1, *p2; + char *line2, *l2, *p1, *p2; + int l; if(line == NULL || keyword == NULL) { return NULL; } + if(full != 0) { full = 1; } @@ -710,6 +782,7 @@ cu_mount_checkoption(char *line, char *keyword, int full) l2++; } + l = strlen(keyword); p1 = line - 1; p2 = strchr(line, ','); do { @@ -738,9 +811,6 @@ cu_mount_getoptionvalue(char *line, char *keyword) r += strlen(keyword); p = strchr(r, ','); if(p == NULL) { - if(strlen(r) == 0) { - return NULL; - } return sstrdup(r); } else { char *m; @@ -755,8 +825,6 @@ cu_mount_getoptionvalue(char *line, char *keyword) return r; } /* char *cu_mount_getoptionvalue(char *line, char *keyword) */ - - int cu_mount_type(const char *type) { @@ -768,5 +836,3 @@ cu_mount_type(const char *type) return CUMT_UNKNOWN; } /* int cu_mount_type(const char *type) */ - -