summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-12 23:32:21 +0000
committerKarl Berry <karl@freefriends.org>2018-12-12 23:32:21 +0000
commite7c6248709acb026c8d8c2fb1fd7e4f968d29b60 (patch)
tree11c461997177fbca12b15e7edecdea91663e52e2
parent8441f31cd34519760d11af39eed6db71dd2ca2d8 (diff)
doc, diag tweaks
git-svn-id: svn://tug.org/texlive/trunk@49397 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/kpathsea/ChangeLog8
-rw-r--r--Build/source/texk/kpathsea/cnf.c18
-rw-r--r--Build/source/texk/kpathsea/expand.h4
-rw-r--r--Build/source/texk/kpathsea/kpsewhich.c3
4 files changed, 21 insertions, 12 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 515f06f1468..fd5d48a42bb 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,11 @@
+2018-12-12 Karl Berry <karl@freefriends.org>
+
+ * expand.h,
+ * pathsearch.h,
+ * cnf.c: doc fixes.
+
+ * kpsewhich.c (main): show path when --show-path can't run.
+
2018-12-11 Karl Berry <karl@freefriends.org>
* kpsewhich.c (main): formatting.
diff --git a/Build/source/texk/kpathsea/cnf.c b/Build/source/texk/kpathsea/cnf.c
index b8d4a9c69ac..60a5df93e6d 100644
--- a/Build/source/texk/kpathsea/cnf.c
+++ b/Build/source/texk/kpathsea/cnf.c
@@ -1,7 +1,7 @@
/* cnf.c: read config files.
Copyright 1994, 1995, 1996, 1997, 2008, 2009, 2011, 2012, 2016,
- 2017 Karl Berry.
+ 2017, 2018 Karl Berry.
Copyright 1997-2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -140,14 +140,14 @@ do_line (kpathsea kpse, string line)
value[len] = 0;
/* Suppose we want to write a single texmf.cnf that can be used under
- both NT and Unix. This is feasible except for the path separators
- : on Unix, ; on NT. We can't switch NT to allowing :'s, since :
- is the drive separator. So we switch Unix to allowing ;'s. On the
- other hand, we don't want to change IS_ENV_SEP and all the rest.
-
- So, simply translate all ;'s in the path
- values to :'s if we are a Unix binary. (Fortunately we don't use ;
- in other kinds of texmf.cnf values.) */
+ both Windows and Unix. This is feasible except for the path
+ separators: : on Unix, ; on Windows. We can't switch Windows to
+ allowing :, since : is the drive separator. So we switch Unix to
+ allowing ;. On the other hand, we don't want to change IS_ENV_SEP
+ and all the rest.
+
+ So, translate all ;'s in the path values to :'s if we'd normally
+ use :. (Fortunately we don't use ; as a normal character in values.) */
if (IS_ENV_SEP(':')) {
string loc;
diff --git a/Build/source/texk/kpathsea/expand.h b/Build/source/texk/kpathsea/expand.h
index cebeb747b5c..7d38611be7b 100644
--- a/Build/source/texk/kpathsea/expand.h
+++ b/Build/source/texk/kpathsea/expand.h
@@ -1,6 +1,6 @@
/* expand.h: general expansion.
- Copyright 1993, 1994, 1996, 2008, 2011 Karl Berry.
+ Copyright 1993, 1994, 1996, 2008, 2011, 2018 Karl Berry.
Copyright 1999, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ extern string kpathsea_expand (kpathsea kpse, const_string s);
#endif /* MAKE_KPSE_DLL */
-/* Do brace expansion and call `kpse_expand' on each element of the
+/* Do brace expansion and call `kpathsea_expand' on each element of the
result; return the final expansion (always in fresh memory, even if
no expansions were done). We don't call `kpse_expand_default'
because there is a whole sequence of defaults to run through; see
diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c
index 5ecd149e6de..30680cc5df2 100644
--- a/Build/source/texk/kpathsea/kpsewhich.c
+++ b/Build/source/texk/kpathsea/kpsewhich.c
@@ -824,7 +824,8 @@ main (int argc, string *argv)
}
puts (kpse->format_info[user_format].path);
} else {
- WARNING ("kpsewhich: Cannot show path for unknown file type");
+ WARNING1 ("kpsewhich: Unknown file type, cannot show path:",
+ path_to_show);
}
}