Fixed quoting bug

Author: jgg
Date: 1998-12-31 05:45:26 GMT
Fixed quoting bug

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 499b72a5e93f13c6d77bd3beb30cf3b970648c6c..a05359f825914d3c0cf0a9986c0fd403ea3a9978 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: strutl.cc,v 1.15 1998/12/04 21:16:50 jgg Exp $
+// $Id: strutl.cc,v 1.16 1998/12/31 05:45:26 jgg Exp $
 /* ######################################################################
 
    String Util - Some usefull string functions.
@@ -189,7 +189,7 @@ string QuoteString(string Str,const char *Bad)
          *I <= 0x20 || *I >= 0x7F)
       {
         char Buf[10];
-        sprintf(Buf,"%%%02x",(int)*I);
+        sprintf(Buf,"%%%02x",(unsigned int)((unsigned char)*I));
         Res += Buf;
       }
       else

diff --git a/doc/files.sgml b/doc/files.sgml
index e86b2def19cedf9efb9f5a9244c97816bb073713..16367b5500be753237aca0c31456e09dcca80627 100644 (file)
--- a/doc/files.sgml
+++ b/doc/files.sgml
@@ -4,7 +4,7 @@
 <title>APT Files</title>
 
 <author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<version>$Id: files.sgml,v 1.4 1998/12/14 04:00:33 jgg Exp $</version>
+<version>$Id: files.sgml,v 1.5 1998/12/31 05:45:26 jgg Exp $</version>
 
 <abstract>
 This document describes the complete implementation and format of the 
@@ -367,7 +367,7 @@ This is the common name we give our archives, such as <em>stable</> or
 
 <tag>Component<item>
 Referes to the sub-component of the archive, <em>main</>, <em>contrib</>
-etc.
+etc. Component may be omitted if there are no components for this archive.
 
 <tag>Version<item>
 This is a version string with the same properties as in the Packages file.

diff --git a/methods/http.cc b/methods/http.cc
index dc0c6d8916597249130ad6baf10bcd56ec67fd5e..4889919dd9dd0131969ec89cdd32654e549649a1 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: http.cc,v 1.18 1998/12/30 02:28:29 jgg Exp $
+// $Id: http.cc,v 1.19 1998/12/31 05:45:26 jgg Exp $
 /* ######################################################################
 
    HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -616,7 +616,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
       and we expect the proxy to do this */
    if (Proxy.empty() == true)
       sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\nConnection: keep-alive\r\n",
-             Uri.Path.c_str(),ProperHost.c_str());
+             QuoteString(Uri.Path,"~").c_str(),ProperHost.c_str());
    else
    {
       /* Generate a cache control header if necessary. We place a max
@@ -664,7 +664,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
           Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n";
 
    Req += "User-Agent: Debian APT-HTTP/1.2\r\n\r\n";
-//   cerr << Req << endl;
+   cerr << Req << endl;
 
    Out.Read(Req);
 }