1 diff -Nru rpm-4.1/lib/rpmrc.c rpm-4.1.new/lib/rpmrc.c
2 --- rpm-4.1/lib/rpmrc.c Tue Aug 20 16:53:44 2002
3 +++ rpm-4.1.new/lib/rpmrc.c Tue Mar 11 18:41:48 2003
4 @@ -1820,23 +1820,37 @@
5 /* Expand ~/ to $HOME/ */
7 if (r[0] == '~' && r[1] == '/') {
8 + const char * etc_dir = getenv("HOME_ETC");
9 const char * home = getenv("HOME");
11 - /* XXX Only /usr/lib/rpm/rpmrc must exist in default rcfiles list */
12 - if (rcfiles == rpmRcfiles && myrcfiles != r)
14 - rpmError(RPMERR_RPMRC, _("Cannot expand %s\n"), r);
18 - if (strlen(home) > (sizeof(fn) - strlen(r))) {
19 - rpmError(RPMERR_RPMRC, _("Cannot read %s, HOME is too large.\n"),
24 + if (strlen(etc_dir) > (sizeof(fn) - strlen(r))) {
25 + rpmError(RPMERR_RPMRC, _("Cannot read %s, HOME_ETC is too large.\n"),r);
29 + strcpy(fn, etc_dir);
30 + strncat(fn, "/", sizeof(fn) - strlen(fn));
34 + /* XXX Only /usr/lib/rpm/rpmrc must exist in default rcfiles list */
35 + if (rcfiles == rpmRcfiles && myrcfiles != r)
37 + rpmError(RPMERR_RPMRC, _("Cannot expand %s\n"), r);
41 + if (strlen(home) > (sizeof(fn) - strlen(r))) {
42 + rpmError(RPMERR_RPMRC, _("Cannot read %s, HOME is too large.\n"),
55 strncat(fn, r, sizeof(fn) - (strlen(fn) + 1));
56 fn[sizeof(fn)-1] = '\0';
57 --- rpm-4.4.8/po/pl.po.orig 2007-04-08 16:11:42.125435004 +0200
58 +++ rpm-4.4.8/po/pl.po 2007-04-08 16:25:11.343549717 +0200
59 @@ -3251,6 +3251,10 @@
60 msgid "Cannot expand %s\n"
61 msgstr "Nie mo¿na rozwin±æ %s\n"
64 +msgid "Cannot read %s, HOME_ETC is too large.\n"
65 +msgstr "Nie mo¿na odczytaæ %s, HOME_ETC jest zbyt du¿e.\n"
69 msgid "Cannot read %s, HOME is too large.\n"