Import Upstream version 1.1

parent 6fe85586
Version 1.1:
- Compilation for GNU/kFreeBSD, thanks to Cyril Brulebois
- Use simple pop-ups for Help and Bug Report buttons
- Use strncpy instead of strcpy for length sensitive copies
- Always compile with -g, disable -O3
- Translation updates: de.po thanks Hermann J. Beckers
- Update manpages axel.1 and axel-kapt.1
- Prevent crash and raise error if FTP CWD fails
- Prevent crash on long URLs and increase max length of URL to 1024
- Fix segfaults on HTTP404 and HTTP401 responses
Finished Jan 18 2008
Version 1.0b:
- Removed spaces between -S[x] in man-pages, etc. They mess things up.
- Fixed configure for OpenBSD.
......
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
......@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
......@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
......@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
......@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
......@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
......@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
......@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
......@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
Axel Home:
See http://axel.alioth.debian.org/ for latest information on axel
/*************************\
* Supported architectures *
\*************************/
My primary development platform is Debian Potato at the moment, the program
should compile on any decent Linux system. Additionaly, it should compile
(and run) on BSD, Solaris, Darwin (Mac OS X) and Win32 (Cygwin) systems. If
you want to run Axel on AtheOS, please try an older Axel (0.96b), since that
version can be compiled without pthreads. AtheOS does implement threads, but
not (yet) pthreads.
Should compile on any decent Linux system. Additionaly, it should compile
(and run) on BSD, Solaris, Darwin (Mac OS X) and Win32 (Cygwin) systems.
If the configure script does weird things on your system, please do warn me!
I test it on as many machines and OS'es as possible, but still anything can
......@@ -53,5 +52,4 @@ discouraged as I consider them abusive. </quote>
And he certainly has a point.. Using more than one server at once is a fine
solution IMHO, so please use this feature if possible!
Wilmer van der Gaast. <lintux@lintux.cx>
Wilmer van der Gaast. <wilmer@gaast.net>
......@@ -98,16 +98,14 @@ it must be a bug..
.SH EXAMPLES
.nf
axel ftp://ftp.{be,nl,uk,de}.kernel.org/pub/linux/kernel/
v2.4/linux-2.4.17.tar.bz2
axel ftp://ftp.{be,nl,uk,de}.kernel.org/pub/linux/kernel/v2.4/linux-2.4.17.tar.bz2
.fi
This will use the Belgian, Dutch, English and German kernel.org mirrors to
download a Linux 2.4.17 kernel image.
.nf
axel -S4 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/
linux-2.4.17.tar.bz2
axel \-S4 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.17.tar.bz2
.fi
This will do a search for the linux-2.4.17.tar.bz2 file on filesearching.com
......@@ -123,7 +121,7 @@ one line in this page.)
.PP
\fI~/.axelrc\fP Personal configuration file
.PP
These files are not documented in a man-page, but the example file which
These files are not documented in a man\-page, but the example file which
comes with the program contains enough information, I hope. The position
of the system-wide configuration file might be different.
......@@ -139,4 +137,4 @@ A known bug is that the program does weird things when downloading using
hundreds of connections. Well, just don't do that.
.SH AUTHORS
Wilmer van der Gaast. (lintux@lintux.cx)
Wilmer van der Gaast. <wilmer@gaast.net>
......@@ -64,7 +64,7 @@ axel_t *axel_new( conf_t *conf, int count, void *url )
{
axel->url = malloc( sizeof( url_t ) );
axel->url->next = axel->url;
strcpy( axel->url->text, (char *) url );
strncpy( axel->url->text, (char *) url, MAX_STRING );
}
else
{
......@@ -72,7 +72,7 @@ axel_t *axel_new( conf_t *conf, int count, void *url )
u = axel->url = malloc( sizeof( url_t ) );
for( i = 0; i < count; i ++ )
{
strcpy( u->text, res[i].url );
strncpy( u->text, res[i].url, MAX_STRING );
if( i < count - 1 )
{
u->next = malloc( sizeof( url_t ) );
......@@ -96,10 +96,10 @@ axel_t *axel_new( conf_t *conf, int count, void *url )
axel->conn[0].local_if = axel->conf->interfaces->text;
axel->conf->interfaces = axel->conf->interfaces->next;
strcpy( axel->filename, axel->conn[0].file );
strncpy( axel->filename, axel->conn[0].file, MAX_STRING );
http_decode( axel->filename );
if( *axel->filename == 0 ) /* Index page == no fn */
strcpy( axel->filename, axel->conf->default_filename );
strncpy( axel->filename, axel->conf->default_filename, MAX_STRING );
if( ( s = strchr( axel->filename, '?' ) ) != NULL && axel->conf->strip_cgi_parameters )
*s = 0; /* Get rid of CGI parameters */
......@@ -119,7 +119,7 @@ axel_t *axel_new( conf_t *conf, int count, void *url )
return( axel );
}
s = conn_url( axel->conn );
strcpy( axel->url->text, s );
strncpy( axel->url->text, s, MAX_STRING );
if( ( axel->size = axel->conn[0].size ) != INT_MAX )
{
if( axel->conf->verbose > 0 )
......@@ -128,7 +128,7 @@ axel_t *axel_new( conf_t *conf, int count, void *url )
/* Wildcards in URL --> Get complete filename */
if( strchr( axel->filename, '*' ) || strchr( axel->filename, '?' ) )
strcpy( axel->filename, axel->conn[0].file );
strncpy( axel->filename, axel->conn[0].file, MAX_STRING );
return( axel );
}
......@@ -444,7 +444,9 @@ void axel_close( axel_t *axel )
/* Terminate any thread still running */
for( i = 0; i < axel->conf->num_connections; i ++ )
pthread_cancel( *axel->conn[i].setup_thread );
/* don't try to kill non existing thread */
if ( *axel->conn[i].setup_thread != 0 )
pthread_cancel( *axel->conn[i].setup_thread );
/* Delete state file if necessary */
if( axel->ready == 1 )
......
......@@ -64,9 +64,9 @@
#endif
/* Compiled-in settings */
#define MAX_STRING 256
#define MAX_STRING 1024
#define MAX_REDIR 5
#define AXEL_VERSION_STRING "1.0b"
#define AXEL_VERSION_STRING "1.1"
#define USER_AGENT "Axel " AXEL_VERSION_STRING " (" ARCH ")"
typedef struct
......
......@@ -85,12 +85,10 @@ if [ "$i18n" = "1" ]; then
fi;
fi
echo 'CFLAGS=-g' >> Makefile.settings
if [ "$debug" = "1" ]; then
echo 'CFLAGS=-g' >> Makefile.settings
echo 'DEBUG=1' >> Makefile.settings
echo '#define DEBUG' >> config.h;
else
echo 'CFLAGS=-O3' >> Makefile.settings;
fi
if [ "$i18n" = "1" ]; then
......@@ -175,14 +173,7 @@ Darwin )
echo 'Please keep in mind that you need GNU make to make Axel!'
echo ''
;;
AtheOS | atheos )
echo 'If you want to run Axel on AtheOS, please use an older non-threaded version.'
echo 'This version still needs some changes to support the AtheOS threads.'
echo ''
echo 'Axel 0.96b can be downloaded from http://www.lintux.cx/axel.html'
exit 1
;;
Linux )
Linux | GNU/kFreeBSD)
echo 'LFLAGS+=-lpthread' >> Makefile.settings
;;
SunOS )
......
......@@ -74,12 +74,12 @@ int conn_set( conn_t *conn, char *set_url )
*j = '?';
if( i == NULL )
{
strcpy( conn->file, conn->dir );
strncpy( conn->file, conn->dir, MAX_STRING );
strcpy( conn->dir, "/" );
}
else
{
strcpy( conn->file, i + 1 );
strncpy( conn->file, i + 1, MAX_STRING );
strcat( conn->dir, "/" );
}
......@@ -89,7 +89,7 @@ int conn_set( conn_t *conn, char *set_url )
strncpy( conn->user, conn->host, MAX_STRING );
i = strrchr( conn->user, '@' );
*i = 0;
strcpy( conn->host, i + 1 );
strncpy( conn->host, i + 1, MAX_STRING );
*conn->pass = 0;
}
/* If not: Fill in defaults */
......@@ -112,7 +112,7 @@ int conn_set( conn_t *conn, char *set_url )
if( ( i = strchr( conn->user, ':' ) ) != NULL )
{
*i = 0;
strcpy( conn->pass, i + 1 );
strncpy( conn->pass, i + 1, MAX_STRING );
}
/* Port number? */
if( ( i = strchr( conn->host, ':' ) ) != NULL )
......@@ -313,7 +313,8 @@ int conn_info( conn_t *conn )
do
{
conn->currentbyte = 1;
conn_setup( conn );
if( !conn_setup( conn ) )
return( 0 );
conn_exec( conn );
conn_disconnect( conn );
/* Code 3xx == redirect */
......
msgid ""
msgstr ""
"Project-Id-Version: Axel\n"
"POT-Creation-Date: 2002-02-19 18:17+0100\n"
"PO-Revision-Date: 2001-11-14 20:37GMT\n"
"Last-Translator: Hermann J. Beckers <hjb-rheine@t-online.de>\n"
"Language-Team: Deutsch <de@li.org>\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-01-18 14:22+0530\n"
"PO-Revision-Date: 2007-12-15 15:18GMT\n"
"Last-Translator: Hermann J. Beckers <hj.beckers@onlinehome.de>\n"
"Language-Team: deutsch <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.8\n"
"X-Generator: KBabel 1.11.4\n"
#: axel.c:55
msgid "Buffer resized for this speed."
......@@ -50,9 +51,9 @@ msgid "Starting download"
msgstr "Starte Abruf"
#: axel.c:240 axel.c:393
#, fuzzy, c-format
#, c-format
msgid "Connection %i downloading from %s:%i using interface %s"
msgstr "Verbindung %i Abruf von %s:%i"
msgstr "Verbindung %i: Abruf von %s:%i ber Schnittstelle %s"
#: axel.c:244 axel.c:402
msgid "pthread error!!!"
......@@ -87,80 +88,102 @@ msgstr "Time-out bei Verbindung %i"
msgid "Error in %s line %i.\n"
msgstr "Fehler in %s Zeile %i.\n"
#: conn.c:344 ftp.c:121
#: conn.c:345 ftp.c:124
#, c-format
msgid "Too many redirects.\n"
msgstr "Zu viele Weiterleitungen (redirects).\n"
#: conn.c:363
#: conn.c:364
#, c-format
msgid "Unknown HTTP error.\n"
msgstr "Unbekannter HTTP Fehler.\n"
#: ftp.c:35 http.c:58
#: ftp.c:35 http.c:60
#, c-format
msgid "Unable to connect to server %s:%i\n"
msgstr "Keine Verbindung mit %s:%i mglich\n"
#: ftp.c:114 ftp.c:174
#: ftp.c:91
#, c-format
msgid "Can't change directory to %s\n"
msgstr "Kann nicht in Verzeichnis %s wechseln\n"
#: ftp.c:117 ftp.c:177
#, c-format
msgid "File not found.\n"
msgstr "Datei nicht gefunden.\n"
#: ftp.c:176
#: ftp.c:179
#, c-format
msgid "Multiple matches for this URL.\n"
msgstr "Mehrere Treffer fr diese URL.\n"
#: ftp.c:247 ftp.c:253
#: ftp.c:250 ftp.c:256
#, c-format
msgid "Error opening passive data connection.\n"
msgstr "Fehler beim ffnen der Passiv-Verbindung.\n"
#: ftp.c:283
#: ftp.c:286
#, c-format
msgid "Error writing command %s\n"
msgstr "Fehler beim Schreiben des Befehls %s\n"
#: ftp.c:308 http.c:148
#: ftp.c:311 http.c:151
#, c-format
msgid "Connection gone.\n"
msgstr "Verbindung geschlossen.\n"
#: http.c:44
#: http.c:45
#, c-format
msgid "Invalid proxy string: %s\n"
msgstr "Ungltige Proxy-Angabe: %s\n"
#: text.c:146
#, c-format
msgid "Can't redirect stdout to /dev/null.\n"
msgstr "Kann Standardausgabe nicht nach /dev/null umleiten.\n"
#: text.c:174
#, c-format
msgid "Can't handle URLs of length over %d\n"
msgstr "Kann URLs mit mehr als %d Zeichen nicht nutzen\n"
#: text.c:179
#, c-format
msgid "Initializing download: %s\n"
msgstr "Starte Abruf: %s\n"
#: text.c:181
#: text.c:186
#, c-format
msgid "Doing search...\n"
msgstr "Suche gestartet...\n"
#: text.c:185
#: text.c:190
#, c-format
msgid "File not found\n"
msgstr "Datei nicht gefunden\n"
#: text.c:189
#: text.c:194
#, c-format
msgid "Testing speeds, this can take a while...\n"
msgstr "Teste Geschwindigkeiten, das kann etwas dauern...\n"
#: text.c:194
#: text.c:199
#, c-format
msgid "%i usable servers found, will use these URLs:\n"
msgstr "%i benutzbare Server gefunden, werde diese URLs benutzen:\n"
#: text.c:256
#: text.c:261
#, c-format
msgid "No state file, cannot resume!\n"
msgstr "Keine Status-Datei, Fortsetzung nicht mglich!\n"
#: text.c:261
#: text.c:266
#, c-format
msgid "State file found, but no downloaded data. Starting from scratch.\n"
msgstr "Status-Datei gefunden, aber noch nichts bertragen. Neustart.\n"
#: text.c:392
#: text.c:397
#, c-format
msgid ""
"\n"
......@@ -169,48 +192,48 @@ msgstr ""
"\n"
"%s abgerufen in %s. (%.2f KB/s)\n"
#: text.c:414
#: text.c:419
#, c-format
msgid "%i byte"
msgstr "%i Byte"
#: text.c:416
#: text.c:421
#, c-format
msgid "%i bytes"
msgstr "%i Bytes"
#: text.c:418
#: text.c:423
#, c-format
msgid "%.1f kilobytes"
msgstr "%.1f Kilobytes"
#: text.c:420
#: text.c:425
#, c-format
msgid "%.1f megabytes"
msgstr "%.1f Megabytes"
#: text.c:429
#: text.c:434
#, c-format
msgid "%i second"
msgstr "%i Sekunde"
#: text.c:431
#: text.c:436
#, c-format
msgid "%i seconds"
msgstr "%i Sekunden"
#: text.c:433
#: text.c:438
#, c-format
msgid "%i:%02i seconds"
msgstr "%i:%02i Sekunden"
#: text.c:435
#: text.c:440
#, c-format
msgid "%i:%02i:%02i seconds"
msgstr "%i:%02i:%02i Sekunden"
#: text.c:509
#, fuzzy
#: text.c:515
#, fuzzy, c-format
msgid ""
"Usage: axel [options] url1 [url2] [url...]\n"
"\n"
......@@ -225,24 +248,24 @@ msgid ""
"-h\tThis information\n"
"-V\tVersion information\n"
"\n"
"Report bugs to lintux@lintux.cx\n"
"Visit http://axel.alioth.debian.org/ to report bugs\n"
msgstr ""
"Aufruf: axel [Optionen] url1 [url2] [url...]\n"
"\n"
"-s x\tMaximale Geschwindigkeit (Bytes pro Sekunde)\n"
"-n x\tMaximale gleichzeitige Verbindungen\n"
"-o f\tLokale Ausgabe-Datei\n"
"-n x\tmaximale gleichzeitige Verbindungen\n"
"-o f\tlokale Ausgabe-Datei\n"
"-S [x]\tSuche nach Spiegelservern und Abruf von x Servern\n"
"-N\tkeinen Proxy-Server benutzen\n"
"-q\tKeine Meldungen auf Standard-Ausgabe\n"
"-v\tZustzliche Status-Information\n"
"-h\tDiese Information\n"
"-q\tkeine Meldungen auf Standard-Ausgabe\n"
"-v\tzustzliche Status-Information\n"
"-h\tdiese Information\n"
"-V\tVersions-Information\n"
"\n"
"Fehler an lintux@lintux.cx melden.\n"
#: text.c:524
#, fuzzy
#: text.c:530
#, fuzzy, c-format
msgid ""
"Usage: axel [options] url1 [url2] [url...]\n"
"\n"
......@@ -257,23 +280,23 @@ msgid ""
"--help\t\t\t-h\tThis information\n"
"--version\t\t-V\tVersion information\n"
"\n"
"Report bugs to lintux@lintux.cx\n"
"Visit http://axel.alioth.debian.org/ to report bugs\n"
msgstr ""
"Aufruf: axel [Optionen] url1 [url2] [url...]\n"
"\n"
"--max-speed=x\t\t-s x\tMaximale Geschwindigkeit (Bytes pro Sekunde)\n"
"--num-connections=x\t-n x\tMaximale gleichzeitige Verbindungen\n"
"--output=f\t\t-o f\tLokale Ausgabe-Datei\n"
"--search=[x]\t\t-S [x] Suche nach Spiegelservern und Abruf von x Servern\n"
"--max-speed=x\t\t-s x\tmaximale Geschwindigkeit (Bytes pro Sekunde)\n"
"--num-connections=x\t-n x\tmaximale gleichzeitige Verbindungen\n"
"--output=f\t\t-o f\tlokale Ausgabe-Datei\n"
"--search=[x]\t\t-S [x] Suche nach Spiegelservern und Abruf von x Servern\n"
"--no-proxy\t\t-N\tkeinen Proxy-Server benutzen\n"
"--quiet\t\t\t-q\tKeine Meldungen auf Standard-Ausgabe\n"
"--verbose\t\t-v\tMehr Fortgangs-Information\n"
"--help\t\t\t-h\tDiese Information\n"
"--quiet\t\t\t-q\tkeine Meldungen auf Standard-Ausgabe\n"
"--verbose\t\t-v\tzustzliche Status-Information\n"
"--help\t\t\t-h\tdiese Information\n"
"--version\t\t-V\tVersions-Information\n"
"\n"
"Fehler an lintux@lintux.cx melden.\n"
#: text.c:543
#: text.c:549
#, c-format
msgid "Axel version %s (%s)\n"
msgstr "Axel Version %s (%s)\n"
......@@ -87,7 +87,10 @@ int ftp_cwd( ftp_t *conn, char *cwd )
ftp_command( conn, "CWD %s", cwd );
if( ftp_wait( conn ) / 100 != 2 )
{
fprintf( stderr, _("Can't change directory to %s\n"), cwd );
return( 0 );
}
strncpy( conn->cwd, cwd, MAX_STRING );
......
......@@ -55,9 +55,9 @@ config :horizontal "OPTIONS" -> checks term max connex search;
local -> file | ! @ ;
file "Save as (optional). Choose a directory and type a filename..." -> " --output=" @directory();
buttons :horizontal "Actions" -> mail help doit quit;
help -> @button(helpwin)="Help";
mail -> @action(bug)="Bug Report";
buttons :horizontal "Actions" -> help mail doit quit;
help -> @preview(helpstr,"Close")="Help";
mail -> @preview(bug,"Close")="Bug Report";
doit -> @exec(axel)="Start";
#doit -> @echo(axel)="Start";
quit -> @close="Exit";
......@@ -65,13 +65,11 @@ buttons :horizontal "Actions" -> mail help doit quit;
filler -> @fill(); #sometimes the bottom is obscured..
#not just in kaptain. Some other qt apps too
helpwin "axel Help Text"-> helptitle helpwindow;
#huge button just to force the dialog wider
helptitle :horizontal -> @text(x%axel -V%) @close=">>>>>>>>>>>> Close this window <<<<<<<<<<<<<";
helpwindow -> @list(x%axel --help%);
bug -> "kmail -s " x%axel -V | grep Axel | sed s/" "/"_"/g% " lintux@lintux.cx";
helpstr -> "Axel is a program that downloads a file from a FTP or HTTP \
server through multiple connection, each connection downloads its own \
part of the file. Read the manual page - axel(1) for various options";
bug -> "Please visit http://axel.alioth.debian.org/ to report bugs on axel-kapt";
axel -> term " -e axel -s " max " -n "connex proxy verb quiet search " " local " " url;
'''
......
......@@ -21,8 +21,9 @@ This program is a KDE front\-end to Axel.
.SH CONFIGURATION
The program is a Python script which generates a Kaptain grammar on the fly.
If you want to change the default terminal, you can edit the source. It's on
line 48 (assuming v0.3)
.SH "SEE ALSO"
axel(1)
.SH COPYRIGHT
Axel\-kapt is Copyright 2001 Paul Evans.
......
[Desktop Entry]
Comment[C]=
Version=1.0
Name=Axel
GenericName=Axel Front-end
Comment=Front-end for Axel - a light download accelerator
Type=Application
Exec=axel-kapt %f
Icon=connect_creating
MimeType=
Name[C]=Axel front-end
Path=
ServiceTypes=
SwallowExec=
SwallowTitle=
Terminal=false
TerminalOptions=
Type=Application
X-KDE-SubstituteUID=false
X-KDE-Username=
Categories=Utility;Network;KDE;
......@@ -41,7 +41,8 @@ int http_connect( http_t *conn, int proto, char *proxy, char *host, int port, ch
sprintf( conn->host, "%s:%i", host, port );
if( !conn_set( tconn, proxy ) )
{
sprintf( conn->request, _("Invalid proxy string: %s\n"), proxy );
/* We'll put the message in conn->headers, not in request */
sprintf( conn->headers, _("Invalid proxy string: %s\n"), proxy );
return( 0 );
}
host = tconn->host;
......@@ -55,7 +56,8 @@ int http_connect( http_t *conn, int proto, char *proxy, char *host, int port, ch
if( ( conn->fd = tcp_connect( host, port, conn->local_if ) ) == -1 )
{
sprintf( conn->request, _("Unable to connect to server %s:%i\n"), host, port );
/* We'll put the message in conn->headers, not in request */
sprintf( conn->headers, _("Unable to connect to server %s:%i\n"), host, port );
return( 0 );
}
......@@ -145,7 +147,8 @@ int http_exec( http_t *conn )
{
if( read( conn->fd, s, 1 ) <= 0 )
{
sprintf( conn->request, _("Connection gone.\n") );
/* We'll put the message in conn->headers, not in request */
sprintf( conn->headers, _("Connection gone.\n") );
return( 0 );
}
if( *s == '\r' )
......
msgid ""
msgstr ""
"Project-Id-Version: Axel\n"
"POT-Creation-Date: 2002-02-19 18:16+0100\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-01-18 14:22+0530\n"
"PO-Revision-Date: 2001-11-14 15:22+0200\n"
"Last-Translator: Wilmer van der Gaast <lintux@lintux.cx>\n"
"Last-Translator: Wilmer van der Gaast <wilmer@gaast.net>\n"
"Language-Team: Dutch <nl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
......@@ -86,80 +87,102 @@ msgstr "Time-out op verbinding %i"
msgid "Error in %s line %i.\n"
msgstr "Fout in %s regel %i.\n"
#: conn.c:344 ftp.c:121
#: conn.c:345 ftp.c:124
#, c-format
msgid "Too many redirects.\n"
msgstr "Te veel redirects.\n"
#: conn.c:363
#: conn.c:364
#, c-format
msgid "Unknown HTTP error.\n"
msgstr "Onbekende HTTP fout.\n"
#: ftp.c:35 http.c:58
#: ftp.c:35 http.c:60
#, c-format
msgid "Unable to connect to server %s:%i\n"
msgstr "Kan niet verbinden met server %s:%i\n"
#: ftp.c:114 ftp.c:174
#: ftp.c:91
#, c-format
msgid "Can't change directory to %s\n"
msgstr ""
#: ftp.c:117 ftp.c:177
#, c-format
msgid "File not found.\n"
msgstr "Bestand niet gevonden.\n"
#: ftp.c:176
#: ftp.c:179
#, c-format
msgid "Multiple matches for this URL.\n"
msgstr "Meerdere bestanden passen bij deze URL.\n"
#: ftp.c:247 ftp.c:253
#: ftp.c:250 ftp.c:256
#, c-format
msgid "Error opening passive data connection.\n"
msgstr "Fout bij het openen van een data verbinding.\n"
#: ftp.c:283
#: ftp.c:286
#, c-format
msgid "Error writing command %s\n"
msgstr "Fout bij het schrijven van commando %s\n"
#: ftp.c:308 http.c:148
#: ftp.c:311 http.c:151
#, c-format
msgid "Connection gone.\n"
msgstr "Verbinding gesloten.\n"
#: http.c:44
#: http.c:45
#, c-format
msgid "Invalid proxy string: %s\n"
msgstr "Ongeldige proxy string: %s\n"
#: text.c:146
#, c-format
msgid "Can't redirect stdout to /dev/null.\n"
msgstr "Fout bij het afsluiten van stdout.\n"
#: text.c:174
#, c-format