Now that only the Section names are case-insensitive

[nfs-utils.git] / utils / mount / stropts.c

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index e277b3d22ac791186c84f6cba11efa80ccae0cde..a12ace7f9f480cd42863843bb32c51f8aaaa4b20 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -130,12 +130,14 @@ static int nfs_append_generic_address_option(const struct sockaddr *sap,
 {
        char address[NI_MAXHOST];
        char new_option[512];
+       int len;
 
        if (!nfs_present_sockaddr(sap, salen, address, sizeof(address)))
                goto out_err;
 
-       if (snprintf(new_option, sizeof(new_option), "%s=%s",
-                                       keyword, address) >= sizeof(new_option))
+       len = snprintf(new_option, sizeof(new_option), "%s=%s",
+                                               keyword, address);
+       if (len < 0 || (size_t)len >= sizeof(new_option))
                goto out_err;
 
        if (po_append(options, new_option) != PO_SUCCEEDED)
@@ -418,11 +420,11 @@ nfs_rewrite_pmap_mount_options(struct mount_options *options)
 {
        struct sockaddr_storage nfs_address;
        struct sockaddr *nfs_saddr = (struct sockaddr *)&nfs_address;
-       socklen_t nfs_salen;
+       socklen_t nfs_salen = sizeof(nfs_address);
        struct pmap nfs_pmap;
        struct sockaddr_storage mnt_address;
        struct sockaddr *mnt_saddr = (struct sockaddr *)&mnt_address;
-       socklen_t mnt_salen;
+       socklen_t mnt_salen = sizeof(mnt_address);
        struct pmap mnt_pmap;
        char *option;