diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-09-02 17:16:29 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-09-02 17:16:29 +0000 |
| commit | 7df8376ba885bb87e4e84a8489bdf0f97accf4cf (patch) | |
| tree | 334cce0e787e55e42acb53785ecacc37c21cc6a3 | |
| parent | e9c52e14b3ccffdd0abb70ed57fda25acd1f8720 (diff) | |
| download | s6-rc-7df8376ba885bb87e4e84a8489bdf0f97accf4cf.tar.xz | |
and another one...
| -rw-r--r-- | src/s6-rc/s6-rc-bundle.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/s6-rc/s6-rc-bundle.c b/src/s6-rc/s6-rc-bundle.c index d00f7dd..75c3ac1 100644 --- a/src/s6-rc/s6-rc-bundle.c +++ b/src/s6-rc/s6-rc-bundle.c @@ -62,7 +62,7 @@ static void check (cdb_t *cr, s6rc_db_t *db, char const *name, int h, int force, return ; } if (h && !force) - strerr_dief4x(1, "identifier ", name, " exists in database ", compiled) ; + strerr_dief4x(1, "identifier ", name, " already exists in database ", compiled) ; if (cdb_datalen(cr) == 4) { uint32 x ; @@ -119,7 +119,9 @@ static void modify_resolve (int fdcompiled, s6rc_db_t *db, char const *const *to strerr_diefu3sys(111, "cdb_read ", compiled, "/resolve.cdb") ; } for (i = 0 ; i < todeln ; i++) if (!str_diffn(todel[i], ktmp, klen)) break ; - if (i >= todeln) + if (i < todeln) continue ; + for (i = 0 ; i < toaddn ; i++) if (!str_diffn(toadd[i], ktmp, klen)) break ; + if (i < toaddn) continue ; { unsigned int dlen = cdb_datalen(&cr) ; char dtmp[dlen + 1] ; |