fix indent
This commit is contained in:
27
ftp.c
27
ftp.c
@@ -1,4 +1,4 @@
|
|||||||
/* $Id: ftp.c,v 1.21 2003/01/11 15:54:09 ukai Exp $ */
|
/* $Id: ftp.c,v 1.22 2003/01/11 15:55:10 ukai Exp $ */
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#include <Str.h>
|
#include <Str.h>
|
||||||
@@ -119,8 +119,7 @@ ftp_login(FTP ftp)
|
|||||||
struct sockaddr_in sockname;
|
struct sockaddr_in sockname;
|
||||||
int socknamelen = sizeof(sockname);
|
int socknamelen = sizeof(sockname);
|
||||||
|
|
||||||
if (!getsockname(sock, (struct sockaddr *)&sockname,
|
if (!getsockname(sock, (struct sockaddr *)&sockname, &socknamelen)) {
|
||||||
&socknamelen)) {
|
|
||||||
struct hostent *sockent;
|
struct hostent *sockent;
|
||||||
tmp = Strnew_charp(ftp->pass);
|
tmp = Strnew_charp(ftp->pass);
|
||||||
|
|
||||||
@@ -264,13 +263,13 @@ ftp_modtime(FTP ftp, char *path)
|
|||||||
static int
|
static int
|
||||||
ftp_quit(FTP ftp)
|
ftp_quit(FTP ftp)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
int status;
|
* int status;
|
||||||
ftp_command(ftp, "QUIT", NULL, &status);
|
* ftp_command(ftp, "QUIT", NULL, &status);
|
||||||
ftp_close(ftp);
|
* ftp_close(ftp);
|
||||||
if (status != 221)
|
* if (status != 221)
|
||||||
return -1;
|
* return -1;
|
||||||
*/
|
*/
|
||||||
ftp_command(ftp, "QUIT", NULL, NULL);
|
ftp_command(ftp, "QUIT", NULL, NULL);
|
||||||
ftp_close(ftp);
|
ftp_close(ftp);
|
||||||
return 0;
|
return 0;
|
||||||
@@ -287,7 +286,7 @@ static int ex_ftpdir_name_size_date(char *, char **, char **, char **);
|
|||||||
#define FTPDIR_FILE 3
|
#define FTPDIR_FILE 3
|
||||||
|
|
||||||
static void
|
static void
|
||||||
closeFTPdata(FILE *f)
|
closeFTPdata(FILE * f)
|
||||||
{
|
{
|
||||||
int status;
|
int status;
|
||||||
if (f) {
|
if (f) {
|
||||||
@@ -337,8 +336,7 @@ openFTPStream(ParsedURL *pu, URLFile *uf)
|
|||||||
|
|
||||||
if (current_ftp.host) {
|
if (current_ftp.host) {
|
||||||
if (!strcmp(current_ftp.host, pu->host) &&
|
if (!strcmp(current_ftp.host, pu->host) &&
|
||||||
current_ftp.port == pu->port &&
|
current_ftp.port == pu->port && !strcmp(current_ftp.user, user)) {
|
||||||
!strcmp(current_ftp.user, user)) {
|
|
||||||
ftp_command(¤t_ftp, "NOOP", NULL, &status);
|
ftp_command(¤t_ftp, "NOOP", NULL, &status);
|
||||||
if (status != 200)
|
if (status != 200)
|
||||||
ftp_close(¤t_ftp);
|
ftp_close(¤t_ftp);
|
||||||
@@ -425,8 +423,7 @@ readFTPDir(ParsedURL *pu)
|
|||||||
if (current_ftp.data == NULL)
|
if (current_ftp.data == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
tmp = ftp_command(¤t_ftp, "SYST", NULL, &status);
|
tmp = ftp_command(¤t_ftp, "SYST", NULL, &status);
|
||||||
if (strstr(tmp->ptr, "UNIX") != NULL ||
|
if (strstr(tmp->ptr, "UNIX") != NULL || !strncmp(tmp->ptr + 4, "Windows_NT", 10)) /* :-) */
|
||||||
!strncmp(tmp->ptr + 4, "Windows_NT", 10)) /* :-) */
|
|
||||||
sv_type = UNIXLIKE_SERVER;
|
sv_type = UNIXLIKE_SERVER;
|
||||||
else
|
else
|
||||||
sv_type = SERVER_NONE;
|
sv_type = SERVER_NONE;
|
||||||
|
|||||||
Reference in New Issue
Block a user