summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:52:22 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:52:22 +0000
commita4edf53b885ce8559115eaf2c4836ec1f76b07ec (patch)
treee7b8969b82c8a6ab4c3dffc708c2236101180e80
parent21ae3cae55e3537db56ae7a77748cacb37b99db6 (diff)
Fixed quoting bug
Author: jgg Date: 1998-12-31 05:45:26 GMT Fixed quoting bug
-rw-r--r--apt-pkg/contrib/strutl.cc4
-rw-r--r--doc/files.sgml4
-rw-r--r--methods/http.cc6
3 files changed, 7 insertions, 7 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 499b72a5e..a05359f82 100644
--- 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 e86b2def1..16367b550 100644
--- 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 dc0c6d891..4889919dd 100644
--- 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);
}