commit ce21475c202a0fcbf05efd5d88fca490f09fba61
parent 7e77181e08df5cc9d9b437cd243ff7bacae3bbc7
Author: Kyle Milz <krwmilz@gmail.com>
Date: Wed, 25 Aug 2021 14:59:05 +0000
Delete DOSNAMES
Diffstat:
M | font-open.c | | | 54 | ------------------------------------------------------ |
1 file changed, 0 insertions(+), 54 deletions(-)
diff --git a/font-open.c b/font-open.c
@@ -86,40 +86,6 @@ static struct findrec search_pkgf = {
}
};
-#ifdef DOSNAMES
-
-static const char no_f_str_dos[] = "/dpi%d/%f.%p";
-
-static struct findrec search_pkgf_dos = {
- /* path1 */ NULL,
-#if CFGFILE
- /* envptr */ NULL,
-#endif
- /* path2 */ DEFAULT_FONT_PATH,
- /* type */ "font",
- /* fF_etc */ "fFdbpm",
- /* x_var_char */ 'd',
- /* n_var_opts */ 3,
- /* no_f_str */ no_f_str_dos,
- /* no_f_str_end */ no_f_str_dos + sizeof(no_f_str_dos) - 1,
- /* abs_str */ "%f.%d%p",
-#ifdef USE_GF
- /* no_f_str_flags */ F_FILE_USED | F_PK_USED,
- /* abs_str_flags */ F_FILE_USED | F_PK_USED,
- /* pk_opt_char */ 'p',
- /* pk_gf_addr */ &fF_values[4],
-#endif
- /* pct_s_str */ "%qfonts/%p/%m//:%qfonts/%p/modeless//",
- {
- /* v.stephead */ NULL,
- /* v.pct_s_head */ NULL,
- /* v.pct_s_count */ 0,
- /* v.pct_s_atom */ NULL,
- /* v.rootp */ NULL,
- }
-};
-#endif /* DOSNAMES */
-
/*
* Information on how to search for vf files.
*/
@@ -1547,16 +1513,10 @@ init_font_open()
#else
search_pkgf.path1 = getenv("XDVIFONTS");
#endif
-#ifdef DOSNAMES
- search_pkgf_dos.path1 = search_pkgf.path1;
-#endif
search_pkgf.envptr = ffgetenv("PKFONTS");
/* clear it if it's a getenv() placeholder */
if (search_pkgf.envptr != NULL && search_pkgf.envptr->value == NULL)
search_pkgf.envptr = NULL;
-#ifdef DOSNAMES
- search_pkgf_dos.envptr = search_pkgf.envptr;
-#endif
#else /* not CFGFILE */
@@ -1570,10 +1530,6 @@ init_font_open()
search_pkgf.path1 = search_pkgf.path2;
search_pkgf.path2 = NULL;
}
-#ifdef DOSNAMES
- search_pkgf_dos.path1 = search_pkgf.path1;
- search_pkgf_dos.path2 = search_pkgf.path2;
-#endif
#endif /* not CFGFILE */
@@ -1746,19 +1702,9 @@ try_size(font, dpi, ret_path)
int dpi;
const char **ret_path;
{
-#ifdef DOSNAMES
- FILE *retval;
-#endif
-
Sprintf(dpi_string, "%d", dpi);
-#ifdef DOSNAMES
- retval = filefind(font, &search_pkgf, ret_path);
- if (retval != NULL) return retval;
- return filefind(font, &search_pkgf_dos, ret_path);
-#else
return filefind(font, &search_pkgf, ret_path);
-#endif
}