Репозитории ALT
5.1: | 1.6f-alt11 |
4.1: | 1.6f-alt1 |
4.0: | 1.5m2-alt4 |
+backports: | 1.6f-alt5.M40.1 |
3.0: | 1.5m2-alt3 |
Группа :: Система/Основа
Пакет: man
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: man-1.5m2-alt-recode2.patch
Скачать
Скачать
diff -upk.orig man-1.5m2.orig/src/man.c man-1.5m2/src/man.c
--- man-1.5m2.orig/src/man.c 2005-06-02 23:41:17 +0400
+++ man-1.5m2/src/man.c 2005-06-02 23:50:33 +0400
@@ -83,6 +83,7 @@ int nocache;
static int is_japanese;
static char *language;
static char **section_list;
+static char *converter;
#ifdef DO_COMPRESS
int do_compress = 1;
@@ -512,6 +513,11 @@ done:
if (tbl_found && !do_troff && *getval("COL"))
add_directive ("COL", "", buf, buflen);
+ if (converter && *converter && strlen(converter) + strlen(buf) + 3 < buflen) {
+ strcat (buf, " | ");
+ strcat (buf, converter);
+ }
+
return 0;
}
@@ -629,7 +635,6 @@ make_roff_command (const char *path, con
char *cp, *fgr, *pl;
char *command = "";
const char *expander;
- const char *converter;
/* if window size differs much from 80, try to adapt */
/* (but write only standard formatted files to the cat directory,
@@ -640,6 +645,7 @@ make_roff_command (const char *path, con
gripe (NO_CAT_FOR_NONSTD_LL);
expander = get_expander (file);
+ free (converter);
converter = make_iconv_cmd (path);
/* head */
@@ -681,10 +687,6 @@ make_roff_command (const char *path, con
}
if (expander && *expander) {
- if (converter && *converter)
- command = my_xsprintf("%s%s '%S' | %s%s",
- bufh, expander, file, converter, buft);
- else
command = my_xsprintf("%s%s '%S'%s",
bufh, expander, file, buft);
} else if (ll || pl) {
@@ -692,10 +694,6 @@ make_roff_command (const char *path, con
if (!cat || !*cat)
cat = "cat";
- if (converter && *converter)
- command = my_xsprintf("%s%s '%S' | %s%s",
- bufh, cat, file, converter, buft);
- else
command = my_xsprintf("%s%s '%S'%s",
bufh, cat, file, buft);
}