X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fconffile.c;h=d74ee60ee45534210071bc6882cd39e386ccd1f3;hp=b93488ea1a33766aa8eb2e1bcf98cd7b083a881b;hb=edf1b1964b565726a0b0f730b109e4491c7929b9;hpb=923f73d334e7969a814d09cbba3a2a416ac7b0dc diff --git a/libopkg/conffile.c b/libopkg/conffile.c index b93488e..d74ee60 100644 --- a/libopkg/conffile.c +++ b/libopkg/conffile.c @@ -40,7 +40,7 @@ int conffile_has_been_modified(opkg_conf_t *conf, conffile_t *conffile) char *md5sum; char *filename = conffile->name; char *root_filename; - int ret; + int ret = 1; if (conffile->value == NULL) { opkg_message(conf, OPKG_NOTICE, "%s: conffile %s has no md5sum\n", __FUNCTION__, conffile->name); @@ -51,14 +51,14 @@ int conffile_has_been_modified(opkg_conf_t *conf, conffile_t *conffile) md5sum = file_md5sum_alloc(root_filename); - ret = strcmp(md5sum, conffile->value); - if (ret) { + if (md5sum && (ret = strcmp(md5sum, conffile->value))) { opkg_message(conf, OPKG_NOTICE, "%s: conffile %s: \t\nold md5=%s \t\nnew md5=%s\n", __FUNCTION__, conffile->name, md5sum, conffile->value); } free(root_filename); - free(md5sum); + if (md5sum) + free(md5sum); return ret; }