[cmucl-commit] [git] CMU Common Lisp branch master updated. snapshot-2011-12-1-ga4e33b7
Raymond Toy
rtoy at common-lisp.net
Thu Dec 8 19:26:06 CET 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".
The branch, master has been updated
via a4e33b7683a15bccdf944729b5c1fcb5a81970cf (commit)
from 576ae2a5a8f79bf983ac3da8237854b2b21dd8c6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a4e33b7683a15bccdf944729b5c1fcb5a81970cf
Author: Raymond Toy <toy.raymond at gmail.com>
Date: Thu Dec 8 10:22:32 2011 -0800
Fix ticket:50
Check if "" (and "/") is in the list of directories and signal an
error so that we use the #P(...) syntax to print out the pathname
readably.
Update the pot and po files accordingly.
diff --git a/src/code/filesys.lisp b/src/code/filesys.lisp
index ab2f564..308b8b5 100644
--- a/src/code/filesys.lisp
+++ b/src/code/filesys.lisp
@@ -488,7 +488,14 @@
(error (intl:gettext ":BACK cannot be represented in namestrings.")))
((member :wild-inferiors)
(pieces "**/"))
- ((or simple-string pattern (eql :wild))
+ (simple-string
+ (when (zerop (length dir))
+ (error (intl:gettext "Cannot represent \"\" in namestrings.")))
+ (when (string-equal dir "/")
+ (error (intl:gettext "Cannot represent an explicit directory separator in namestrings.")))
+ (pieces (unparse-unix-piece dir))
+ (pieces "/"))
+ ((or pattern (eql :wild))
(pieces (unparse-unix-piece dir))
(pieces "/"))
(t
diff --git a/src/i18n/locale/cmucl.pot b/src/i18n/locale/cmucl.pot
index 92ace3d..a1087ca 100644
--- a/src/i18n/locale/cmucl.pot
+++ b/src/i18n/locale/cmucl.pot
@@ -9026,7 +9026,15 @@ msgid ""
"Convert String to octets using the specified External-format. The\n"
" string is bounded by Start (defaulting to 0) and End (defaulting to\n"
" the end of the string. If Buffer is given, the octets are stored\n"
-" there. If not, a new buffer is created."
+" there. If not, a new buffer is created. Buffer-start specifies\n"
+" where in the buffer the first octet will be placed.\n"
+"\n"
+" Three values are returned: The buffer, the number of valid octets\n"
+" written, and the number of characters converted. Note that the\n"
+" actual number of octets written may be greater than the returned\n"
+" value, These represent the partial octets of the next character to\n"
+" be converted, but there was not enough room to hold the complete set\n"
+" of octets."
msgstr ""
#: src/code/extfmts.lisp
@@ -9807,6 +9815,14 @@ msgid ":BACK cannot be represented in namestrings."
msgstr ""
#: src/code/filesys.lisp
+msgid "Cannot represent \"\" in namestrings."
+msgstr ""
+
+#: src/code/filesys.lisp
+msgid "Cannot represent an explicit directory separator in namestrings."
+msgstr ""
+
+#: src/code/filesys.lisp
msgid "Cannot specify a directory separator in a pathname name: ~S"
msgstr ""
diff --git a/src/i18n/locale/en at piglatin/LC_MESSAGES/cmucl.po b/src/i18n/locale/en at piglatin/LC_MESSAGES/cmucl.po
index 78da94f..37c3afe 100644
--- a/src/i18n/locale/en at piglatin/LC_MESSAGES/cmucl.po
+++ b/src/i18n/locale/en at piglatin/LC_MESSAGES/cmucl.po
@@ -12874,15 +12874,16 @@ msgid ""
"Convert String to octets using the specified External-format. The\n"
" string is bounded by Start (defaulting to 0) and End (defaulting to\n"
" the end of the string. If Buffer is given, the octets are stored\n"
-" there. If not, a new buffer is created."
+" there. If not, a new buffer is created. Buffer-start specifies\n"
+" where in the buffer the first octet will be placed.\n"
+"\n"
+" Three values are returned: The buffer, the number of valid octets\n"
+" written, and the number of characters converted. Note that the\n"
+" actual number of octets written may be greater than the returned\n"
+" value, These represent the partial octets of the next character to\n"
+" be converted, but there was not enough room to hold the complete set\n"
+" of octets."
msgstr ""
-"Onvertcay Ingstray otay octetsway usingway ethay ecifiedspay Externalway-"
-"ormatfay. Ethay\n"
-" ingstray isway oundedbay ybay Tartsay (efaultingday otay 0) andway Endway "
-"(efaultingday otay\n"
-" ethay endway ofway ethay ingstray. Ifway Ufferbay isway ivengay, ethay "
-"octetsway areway toredsay\n"
-" erethay. Ifway otnay, away ewnay ufferbay isway eatedcray."
#: src/code/extfmts.lisp
msgid ""
@@ -13990,6 +13991,18 @@ msgid ":BACK cannot be represented in namestrings."
msgstr ":BACK annotcay ebay epresentedray inway amestringsnay."
#: src/code/filesys.lisp
+#, fuzzy
+msgid "Cannot represent \"\" in namestrings."
+msgstr ":BACK annotcay ebay epresentedray inway amestringsnay."
+
+#: src/code/filesys.lisp
+#, fuzzy
+msgid "Cannot represent an explicit directory separator in namestrings."
+msgstr ""
+"Annotcay ecifyspay away irectoryday eparatorsay inway away athnamepay "
+"amenay: ~S"
+
+#: src/code/filesys.lisp
msgid "Cannot specify a directory separator in a pathname name: ~S"
msgstr ""
"Annotcay ecifyspay away irectoryday eparatorsay inway away athnamepay "
@@ -30436,6 +30449,20 @@ msgstr ""
"eplacementray aracterchay."
#~ msgid ""
+#~ "Convert String to octets using the specified External-format. The\n"
+#~ " string is bounded by Start (defaulting to 0) and End (defaulting to\n"
+#~ " the end of the string. If Buffer is given, the octets are stored\n"
+#~ " there. If not, a new buffer is created."
+#~ msgstr ""
+#~ "Onvertcay Ingstray otay octetsway usingway ethay ecifiedspay Externalway-"
+#~ "ormatfay. Ethay\n"
+#~ " ingstray isway oundedbay ybay Tartsay (efaultingday otay 0) andway "
+#~ "Endway (efaultingday otay\n"
+#~ " ethay endway ofway ethay ingstray. Ifway Ufferbay isway ivengay, ethay "
+#~ "octetsway areway toredsay\n"
+#~ " erethay. Ifway otnay, away ewnay ufferbay isway eatedcray."
+
+#~ msgid ""
#~ "Return a pathname describing what file COMPILE-FILE would write to given\n"
#~ " these arguments."
#~ msgstr ""
diff --git a/src/i18n/locale/ko/LC_MESSAGES/cmucl.po b/src/i18n/locale/ko/LC_MESSAGES/cmucl.po
index a806bec..12d0955 100644
--- a/src/i18n/locale/ko/LC_MESSAGES/cmucl.po
+++ b/src/i18n/locale/ko/LC_MESSAGES/cmucl.po
@@ -9046,7 +9046,15 @@ msgid ""
"Convert String to octets using the specified External-format. The\n"
" string is bounded by Start (defaulting to 0) and End (defaulting to\n"
" the end of the string. If Buffer is given, the octets are stored\n"
-" there. If not, a new buffer is created."
+" there. If not, a new buffer is created. Buffer-start specifies\n"
+" where in the buffer the first octet will be placed.\n"
+"\n"
+" Three values are returned: The buffer, the number of valid octets\n"
+" written, and the number of characters converted. Note that the\n"
+" actual number of octets written may be greater than the returned\n"
+" value, These represent the partial octets of the next character to\n"
+" be converted, but there was not enough room to hold the complete set\n"
+" of octets."
msgstr ""
#: src/code/extfmts.lisp
@@ -9830,6 +9838,14 @@ msgid ":BACK cannot be represented in namestrings."
msgstr ""
#: src/code/filesys.lisp
+msgid "Cannot represent \"\" in namestrings."
+msgstr ""
+
+#: src/code/filesys.lisp
+msgid "Cannot represent an explicit directory separator in namestrings."
+msgstr ""
+
+#: src/code/filesys.lisp
msgid "Cannot specify a directory separator in a pathname name: ~S"
msgstr ""
-----------------------------------------------------------------------
Summary of changes:
src/code/filesys.lisp | 9 ++++-
src/i18n/locale/cmucl.pot | 18 +++++++++-
src/i18n/locale/en at piglatin/LC_MESSAGES/cmucl.po | 43 ++++++++++++++++++----
src/i18n/locale/ko/LC_MESSAGES/cmucl.po | 18 +++++++++-
4 files changed, 77 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMU Common Lisp
More information about the cmucl-commit
mailing list