Use estrlcat where possible

This commit is contained in:
FRIGN 2016-02-11 15:25:23 +01:00 committed by sin
parent 4dbd00fc94
commit 4c33cf2a98

View File

@ -212,8 +212,7 @@ main(int argc, char *argv[])
aflag = 1; aflag = 1;
break; break;
case 'o': case 'o':
if (strlcat(fsopts, EARGF(usage()), sizeof(fsopts)) >= sizeof(fsopts)) estrlcat(fsopts, EARGF(usage()), sizeof(fsopts));
eprintf("option string too long\n");
parseopts(fsopts, &flags, data, sizeof(data)); parseopts(fsopts, &flags, data, sizeof(data));
break; break;
case 't': case 't':
@ -263,8 +262,7 @@ main(int argc, char *argv[])
source = me->mnt_fsname; source = me->mnt_fsname;
} }
if (!fsopts[0]) if (!fsopts[0])
if (strlcat(fsopts, me->mnt_opts, sizeof(fsopts)) >= sizeof(fsopts)) estrlcat(fsopts, me->mnt_opts, sizeof(fsopts));
eprintf("%s: option string too long\n", target);
parseopts(fsopts, &flags, data, sizeof(data)); parseopts(fsopts, &flags, data, sizeof(data));
if (!types) if (!types)
types = me->mnt_type; types = me->mnt_type;