[vlc-devel] commit: Revert "update: allow update_Download to accept: directory, filename, NULL" ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Thu Aug 20 08:08:24 2009 +0200| [85abebf7168aba4fbbfe806567d8a2d55f6ca784] | committer: Rafaël Carré 

Revert "update: allow update_Download  to accept: directory, filename, NULL"

This reverts commit 0f245d7bdd245fb84181d8911d72bbc62f099844.

Conflicts:

	src/misc/update.c

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=85abebf7168aba4fbbfe806567d8a2d55f6ca784
---

 src/misc/update.c |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/misc/update.c b/src/misc/update.c
index eb88e33..7cbaea0 100644
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -35,9 +35,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
 
 #include <vlc_common.h>
 #include <vlc_update.h>
@@ -537,7 +534,6 @@ static void* update_DownloadReal( vlc_object_t *p_this )
     char *psz_tmpdestfile = NULL;
 
     FILE *p_file = NULL;
-    struct stat p_stat;
     stream_t *p_stream = NULL;
     void* p_buffer = NULL;
     int i_read;
@@ -569,16 +565,8 @@ static void* update_DownloadReal( vlc_object_t *p_this )
         goto end;
     }
     psz_tmpdestfile++;
-
-    if( utf8_stat( psz_destdir, &p_stat) == 0 && (p_stat.st_mode & S_IFDIR) )
-    {
-        if( asprintf( &psz_destfile, "%s%c%s", psz_destdir, DIR_SEP_CHAR, psz_tmpdestfile ) == -1 )
-            goto end;
-    }
-    else if( psz_destdir )
-        psz_destfile = strdup( psz_destdir );
-    else
-        psz_destfile = strdup( psz_tmpdestfile );
+    if( asprintf( &psz_destfile, "%s%s", psz_destdir, psz_tmpdestfile ) == -1 )
+        goto end;
 
     p_file = utf8_fopen( psz_destfile, "w" );
     if( !p_file )