From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6212 invoked by alias); 15 Jun 2006 18:38:44 -0000 Received: (qmail 6202 invoked by uid 22791); 15 Jun 2006 18:38:43 -0000 X-Spam-Check-By: sourceware.org Received: from relay2.es.uci.edu (HELO relay2.es.uci.edu) (128.200.80.28) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 15 Jun 2006 18:38:41 +0000 Received: from [128.195.174.114] (jupiter.ece.uci.edu [128.195.174.114]) (authenticated bits=0) by relay2.es.uci.edu (8.13.1/8.13.1) with ESMTP id k5FIcdV2007757 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for ; Thu, 15 Jun 2006 11:38:40 -0700 X-UCInetID: tharmon Mime-Version: 1.0 (Apple Message framework v750) To: docbook-tools-discuss@sourceware.org Message-Id: Content-Type: multipart/signed; micalg=sha1; boundary=Apple-Mail-49-290826033; protocol="application/pkcs7-signature" From: Trevor Harmon Subject: Patch for handling spaces in directory name Date: Thu, 15 Jun 2006 18:38:00 -0000 X-Mailer: Apple Mail (2.750) X-IsSubscribed: yes Mailing-List: contact docbook-tools-discuss-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: docbook-tools-discuss-owner@sourceware.org X-SW-Source: 2006/txt/msg00012.txt.bz2 --Apple-Mail-49-290826033 Content-Type: multipart/mixed; boundary=Apple-Mail-48-290825652 --Apple-Mail-48-290825652 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Content-length: 503 There's a bug in docbook-tools 0.6.14: If the directory containing the DocBook file to be processed has a space in it, the scripts will fail. I've attached a patch that fixes this bug. Basically, all I did was put quotes around shell variables. However, I did have to make a more substantial change: The SGML_FILE variable had to be factored out of SGML_ARGUMENTS so that it could be quoted. Could someone with commit rights please take a look at this patch and apply it? Thanks, Trevor --Apple-Mail-48-290825652 Content-Transfer-Encoding: 7bit Content-Type: application/octet-stream; x-unix-mode=0644; name="docbook-directory-with-spaces.patch" Content-Disposition: attachment; filename=docbook-directory-with-spaces.patch Content-length: 8697 Index: docbook-utils/backends/dvi =================================================================== RCS file: /cvs/docbook-tools/docbook-tools/docbook-utils/backends/dvi,v retrieving revision 1.3 diff -u -r1.3 dvi --- docbook-utils/backends/dvi 13 Jan 2003 17:14:10 -0000 1.3 +++ docbook-utils/backends/dvi 15 Jun 2006 18:36:11 -0000 @@ -6,31 +6,31 @@ export TEXINPUTS # Convert to TeX -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi # Convert from TeX to DVI -jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp +jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp" if [ $? -ne 0 ] then - cat ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tex + cat "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tex" exit 2 fi -rm ${SGML_FILE_NAME}.tmp +rm "${SGML_FILE_NAME}.tmp" # If there are unresolved references, re-run jadetex, twice -if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1 +if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1 then - jadetex ${SGML_FILE_NAME}.tex >/dev/null - jadetex ${SGML_FILE_NAME}.tex >/dev/null + jadetex "${SGML_FILE_NAME}.tex" >/dev/null + jadetex "${SGML_FILE_NAME}.tex" >/dev/null fi -rm ${SGML_FILE_NAME}.log -rm ${SGML_FILE_NAME}.aux -rm ${SGML_FILE_NAME}.tex -rm ${SGML_FILE_NAME}.out +rm "${SGML_FILE_NAME}.log" +rm "${SGML_FILE_NAME}.aux" +rm "${SGML_FILE_NAME}.tex" +rm "${SGML_FILE_NAME}.out" exit 0 Index: docbook-utils/backends/html =================================================================== RCS file: /cvs/docbook-tools/docbook-tools/docbook-utils/backends/html,v retrieving revision 1.1 diff -u -r1.1 html --- docbook-utils/backends/html 21 Jul 2000 18:15:22 -0000 1.1 +++ docbook-utils/backends/html 15 Jun 2006 18:36:11 -0000 @@ -3,7 +3,7 @@ # This program is under GPL license. See LICENSE file for details. # Convert to HTML -$SGML_JADE -t sgml $SGML_ARGUMENTS +$SGML_JADE -t sgml $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi Index: docbook-utils/backends/pdf =================================================================== RCS file: /cvs/docbook-tools/docbook-tools/docbook-utils/backends/pdf,v retrieving revision 1.5 diff -u -r1.5 pdf --- docbook-utils/backends/pdf 17 Mar 2003 17:47:11 -0000 1.5 +++ docbook-utils/backends/pdf 15 Jun 2006 18:36:11 -0000 @@ -6,26 +6,26 @@ export TEXINPUTS # Convert to TeX -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi # Convert from TeX to PDF -pdfjadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp +pdfjadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp" if [ $? -ne 0 ] then - cat ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tex + cat "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tex" exit 2 fi -rm ${SGML_FILE_NAME}.tmp +rm "${SGML_FILE_NAME}.tmp" # Unconditionally re-run pdfjadetex, twice -pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null -pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null -rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \ - ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out +pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null +pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null +rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \ + "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out" exit 0 Index: docbook-utils/backends/ps =================================================================== RCS file: /cvs/docbook-tools/docbook-tools/docbook-utils/backends/ps,v retrieving revision 1.5 diff -u -r1.5 ps --- docbook-utils/backends/ps 17 Mar 2003 17:51:48 -0000 1.5 +++ docbook-utils/backends/ps 15 Jun 2006 18:36:11 -0000 @@ -6,30 +6,30 @@ export TEXINPUTS # Convert to TeX -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi # Convert from TeX to DVI -jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp +jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp" if [ $? -ne 0 ] then - cat ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tex + cat "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tex" exit 2 fi -rm ${SGML_FILE_NAME}.tmp +rm "${SGML_FILE_NAME}.tmp" # If there are unresolved references, re-run jadetex, twice if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1 then - jadetex ${SGML_FILE_NAME}.tex >/dev/null - jadetex ${SGML_FILE_NAME}.tex >/dev/null + jadetex "${SGML_FILE_NAME}.tex" >/dev/null + jadetex "${SGML_FILE_NAME}.tex" >/dev/null fi -rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \ - ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out +rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \ + "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out" # Convert from DVI to PostScript PAPERSIZE="-t letter" @@ -38,12 +38,12 @@ PAPERSIZE="-t a4" fi -dvips -R -q $PAPERSIZE ${SGML_FILE_NAME}.dvi -o ${SGML_FILE_NAME}.ps +dvips -R -q $PAPERSIZE "${SGML_FILE_NAME}.dvi" -o "${SGML_FILE_NAME}.ps" if [ $? -ne 0 ] then - rm ${SGML_FILE_NAME}.dvi + rm "${SGML_FILE_NAME}.dvi" exit 3 fi -rm ${SGML_FILE_NAME}.dvi +rm "${SGML_FILE_NAME}.dvi" exit 0 Index: docbook-utils/backends/rtf =================================================================== RCS file: /cvs/docbook-tools/docbook-tools/docbook-utils/backends/rtf,v retrieving revision 1.1 diff -u -r1.1 rtf --- docbook-utils/backends/rtf 21 Jul 2000 18:15:22 -0000 1.1 +++ docbook-utils/backends/rtf 15 Jun 2006 18:36:11 -0000 @@ -3,7 +3,7 @@ # This program is under GPL license. See LICENSE file for details. # Convert to RTF -$SGML_JADE -t rtf -o ${SGML_FILE_NAME}.rtf $SGML_ARGUMENTS +$SGML_JADE -t rtf -o "${SGML_FILE_NAME}.rtf" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi Index: docbook-utils/backends/tex =================================================================== RCS file: /cvs/docbook-tools/docbook-tools/docbook-utils/backends/tex,v retrieving revision 1.1 diff -u -r1.1 tex --- docbook-utils/backends/tex 21 Jul 2000 18:15:22 -0000 1.1 +++ docbook-utils/backends/tex 15 Jun 2006 18:36:11 -0000 @@ -3,7 +3,7 @@ # This program is under GPL license. See LICENSE file for details. # Convert to TeX -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi Index: docbook-utils/backends/txt =================================================================== RCS file: /cvs/docbook-tools/docbook-tools/docbook-utils/backends/txt,v retrieving revision 1.5 diff -u -r1.5 txt --- docbook-utils/backends/txt 11 Feb 2004 13:58:03 -0000 1.5 +++ docbook-utils/backends/txt 15 Jun 2006 18:36:11 -0000 @@ -23,7 +23,7 @@ trap 'rm -f "$HTML"; exit' 0 1 2 3 7 13 15 # Convert to HTML -$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} >${HTML} +$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} "$SGML_FILE" >${HTML} if [ $? -ne 0 ] then exit 1 fi Index: docbook-utils/bin/jw.in =================================================================== RCS file: /cvs/docbook-tools/docbook-tools/docbook-utils/bin/jw.in,v retrieving revision 1.23 diff -u -r1.23 jw.in --- docbook-utils/bin/jw.in 19 Aug 2004 08:30:13 -0000 1.23 +++ docbook-utils/bin/jw.in 15 Jun 2006 18:36:11 -0000 @@ -270,14 +270,14 @@ echo -e $SGML_HELP_MESSAGE >&2 exit 1 fi -if [ ! -s $SGML_FILE ] +if [ ! -s "$SGML_FILE" ] then echo "`basename $0`: Cannot open \"$SGML_FILE\"." >&2 exit 3 fi # Separate the file name and the extension (if any) -SGML_FILE_NAME=`basename $SGML_FILE` +SGML_FILE_NAME=`basename "$SGML_FILE"` SGML_FILE_NAME=${SGML_FILE_NAME%.*} # Determine if we are in an XML file @@ -416,7 +416,7 @@ fi # Prepare the parser's arguments -SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL $SGML_FILE" +SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL" # Call the backend echo "Using catalogs: `echo $SGML_CATALOG_FILES | sed 's/:/, /g'`" @@ -430,7 +430,7 @@ then sh $SGML_BACKEND else - sh $SGML_BACKEND >$SGML_FILE_NAME.html + sh $SGML_BACKEND > "$SGML_FILE_NAME.html" fi SGML_RETURN=$? cd "$SGML_CURRENT_DIRECTORY" --Apple-Mail-48-290825652-- --Apple-Mail-49-290826033 Content-Transfer-Encoding: base64 Content-Type: application/pkcs7-signature; name=smime.p7s Content-Disposition: attachment; filename=smime.p7s Content-length: 3205 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEH AQAAoIIGFjCCAs8wggI4oAMCAQICAw+bgjANBgkqhkiG9w0BAQQFADBiMQsw CQYDVQQGEwJaQTElMCMGA1UEChMcVGhhd3RlIENvbnN1bHRpbmcgKFB0eSkg THRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIElzc3Vp bmcgQ0EwHhcNMDUxMDA2MjM1NjU0WhcNMDYxMDA2MjM1NjU0WjBDMR8wHQYD VQQDExZUaGF3dGUgRnJlZW1haWwgTWVtYmVyMSAwHgYJKoZIhvcNAQkBFhF0 cmV2b3JAdm9jYXJvLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC ggEBAKHN6dinKcCkxAVnBngOY9R5GWdVwER8Kw8gyaxpJeFGi32EFpf05bRv cVq/8zf7j9OCGp3PjxF5TZCer4WrgFBjZa8/gNtpeSDuDFNTpd3E+wDLyoMQ 3bXVSG6AbilG1ab++3RIoEel9U+YZ997DyXMlSXrBq3Z5SHs0M1fpugC2MA/ cQY6swZ8IwUZVRGP52V4eXa1RmlBYWVEcIKpYKy4QpBHMlduP7xmv24D8JJI I12qCxbplqTw+Ze5bZo5tqINTVrfI13xeYTP11GNKo7mAVeIFOzfKkRYFpYZ juqwYEr/niiU6buPor93hCOhOwjvCXJOFDeSstgHddhqCaMCAwEAAaMuMCww HAYDVR0RBBUwE4ERdHJldm9yQHZvY2Fyby5jb20wDAYDVR0TAQH/BAIwADAN BgkqhkiG9w0BAQQFAAOBgQBRgO+9zIJGeLlkGnwUVRoFW0s7SkLw1YifmX86 0D1G0d9qB5R26HFgj155jfE38OBDt51bk6rVKHCkz2zzareoDl5vwlH/JotN BEv0qJH0B755D5IEncSy1FceW/qr7ffUwGVp9C3zZM+9Y0CCMSho9rqxY3bo FtilKEolYUq5czCCAz8wggKooAMCAQICAQ0wDQYJKoZIhvcNAQEFBQAwgdEx CzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcT CUNhcGUgVG93bjEaMBgGA1UEChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNV BAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xJDAiBgNVBAMT G1RoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYc cGVyc29uYWwtZnJlZW1haWxAdGhhd3RlLmNvbTAeFw0wMzA3MTcwMDAwMDBa Fw0xMzA3MTYyMzU5NTlaMGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3 dGUgQ29uc3VsdGluZyAoUHR5KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVy c29uYWwgRnJlZW1haWwgSXNzdWluZyBDQTCBnzANBgkqhkiG9w0BAQEFAAOB jQAwgYkCgYEAxKY8VXNV+065yplaHmjAdQRwnd/p/6Me7L3N9VvyGna9fww6 YfK/Uc4B1OVQCjDXAmNaLIkVcI7dyfArhVqqP3FWy688Cwfn8R+RNiQqE88r 1fOCdz0Dviv+uxg+B79AgAJk16emu59l0cUqVIUPSAR/p7bRPGEEQB5kGXJg t/sCAwEAAaOBlDCBkTASBgNVHRMBAf8ECDAGAQH/AgEAMEMGA1UdHwQ8MDow OKA2oDSGMmh0dHA6Ly9jcmwudGhhd3RlLmNvbS9UaGF3dGVQZXJzb25hbEZy ZWVtYWlsQ0EuY3JsMAsGA1UdDwQEAwIBBjApBgNVHREEIjAgpB4wHDEaMBgG A1UEAxMRUHJpdmF0ZUxhYmVsMi0xMzgwDQYJKoZIhvcNAQEFBQADgYEASIzR UIPqCy7MDaNmrGcPf6+svsIXoUOWlJ1/TCG4+DYfqi2fNi/A9BxQIJNwPP2t 4WFiw9k6GX6EsZkbAMUaC4J0niVQlGLH2ydxVyWN3amcOY6MIE9lX5Xa9/eH 1sYITq726jTlEBpbNU1341YheILcIRk13iSx0x1G/11fZU8xggLnMIIC4wIB ATBpMGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGlu ZyAoUHR5KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1h aWwgSXNzdWluZyBDQQIDD5uCMAkGBSsOAwIaBQCgggFTMBgGCSqGSIb3DQEJ AzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTA2MDYxNTE4MzgzOFow IwYJKoZIhvcNAQkEMRYEFJFuld4zi3AS0znywIIOmqvBG90sMHgGCSsGAQQB gjcQBDFrMGkwYjELMAkGA1UEBhMCWkExJTAjBgNVBAoTHFRoYXd0ZSBDb25z dWx0aW5nIChQdHkpIEx0ZC4xLDAqBgNVBAMTI1RoYXd0ZSBQZXJzb25hbCBG cmVlbWFpbCBJc3N1aW5nIENBAgMPm4IwegYLKoZIhvcNAQkQAgsxa6BpMGIx CzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5 KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNz dWluZyBDQQIDD5uCMA0GCSqGSIb3DQEBAQUABIIBACbKU1HcU6ftXuV4vrYt cLtKsYkgLPLnGcktmAfmvzjRQWpDDj1c993zg4I8FMF/JS18dr6pRlyPcm/z 91wKICSH1jspkkcEzmbIEveaaG3SKczOqXQ6l7QkVkD5RokzXWgFJOz8yjMh z9/x0Ujc4whFE9oPuk1d9yX8gjxqizQggIafKzT0L0adF+T8FOiCFHTXlFeD GOCbfx1lFYp4sOJNRgoOepG9RJRZ4sUyqlNhEe0EQxoC87aSl+ElOmOcE9P+ IM8G/lFB2Chcy5jTM2fhIPZusm3DTF74+PvkA2K90+7Hl0WuukhrlIA+d5lQ J0MJcqTcyC23XEc1GH9ROKkAAAAAAAA= --Apple-Mail-49-290826033--