#include <vlc_common.h>
#include <vlc_charset.h>
#include "libvlc.h" /* utf8_mkdir */
+#include <vlc_rand.h>
#include <assert.h>
#endif
#ifdef WIN32
# include <io.h>
+# ifndef UNDER_CE
+# include <direct.h>
+# endif
#else
# include <unistd.h>
#endif
# define lstat( a, b ) stat(a, b)
#endif
-#ifdef __APPLE__
-/* Define this if the OS always use UTF-8 internally */
-# define ASSUME_UTF8 1
-#endif
-
-#if defined (ASSUME_UTF8)
-/* Cool */
-#elif defined (WIN32) || defined (UNDER_CE)
-# define USE_MB2MB 1
-#elif defined (HAVE_ICONV)
-# define USE_ICONV 1
-#else
-# error No UTF8 charset conversion implemented on this platform!
+#ifdef WIN32
+static int convert_path (const char *restrict path, wchar_t *restrict wpath)
+{
+ if (!MultiByteToWideChar (CP_UTF8, 0, path, -1, wpath, MAX_PATH))
+ {
+ errno = ENOENT;
+ return -1;
+ }
+ wpath[MAX_PATH] = L'\0';
+ return 0;
+}
+# define CONVERT_PATH(path, wpath, err) \
+ wchar_t wpath[MAX_PATH+1]; \
+ if (convert_path (path, wpath)) \
+ return (err)
#endif
/**
*
* @param filename file path to open (with UTF-8 encoding)
* @param flags open() flags, see the C library open() documentation
- * @param mode file permissions if creating a new file
* @return a file handle on success, -1 on error (see errno).
+ * @note Contrary to standard open(), this function returns file handles
+ * with the close-on-exec flag enabled.
*/
-int utf8_open (const char *filename, int flags, mode_t mode)
+int utf8_open (const char *filename, int flags, ...)
{
+ unsigned int mode = 0;
+ va_list ap;
+
+ va_start (ap, flags);
+ if (flags & O_CREAT)
+ mode = va_arg (ap, unsigned int);
+ va_end (ap);
+
+#ifdef O_CLOEXEC
+ flags |= O_CLOEXEC;
+#endif
+
#ifdef UNDER_CE
/*_open translates to wchar internally on WinCE*/
return _open (filename, flags, mode);
#elif defined (WIN32)
- /* for Windows NT and above */
- wchar_t wpath[MAX_PATH + 1];
-
- if (!MultiByteToWideChar (CP_UTF8, 0, filename, -1, wpath, MAX_PATH))
- {
- errno = ENOENT;
- return -1;
- }
- wpath[MAX_PATH] = L'\0';
-
/*
- * open() cannot open files with non-“ANSI” characters on Windows.
- * We use _wopen() instead. Same thing for mkdir() and stat().
- */
+ * open() cannot open files with non-“ANSI” characters on Windows.
+ * We use _wopen() instead. Same thing for mkdir() and stat().
+ */
+ CONVERT_PATH(filename, wpath, -1);
return _wopen (wpath, flags, mode);
#endif
}
int fd = open (local_name, flags, mode);
+#ifdef HAVE_FCNTL
+ if (fd != -1)
+ fcntl (fd, F_SETFD, FD_CLOEXEC);
+#endif
+
LocaleFree (local_name);
return fd;
}
*/
int utf8_mkdir( const char *dirname, mode_t mode )
{
-#if defined (UNDER_CE) || defined (WIN32)
- VLC_UNUSED( mode );
-
- wchar_t wname[MAX_PATH + 1];
- char mod[MAX_PATH + 1];
- int i;
-
- /* Convert '/' into '\' */
- for( i = 0; *dirname; i++ )
- {
- if( i == MAX_PATH )
- return -1; /* overflow */
-
- if( *dirname == '/' )
- mod[i] = '\\';
- else
- mod[i] = *dirname;
- dirname++;
-
- }
- mod[i] = 0;
-
- if( MultiByteToWideChar( CP_UTF8, 0, mod, -1, wname, MAX_PATH ) == 0 )
- {
- errno = ENOENT;
- return -1;
- }
- wname[MAX_PATH] = L'\0';
+#if defined (UNDER_CE)
+ (void) mode;
+ /* mkdir converts internally to wchar */
+ return _mkdir(dirname);
+#elif defined (WIN32)
+ (void) mode;
+ CONVERT_PATH (dirname, wpath, -1);
+ return _wmkdir (wpath);
- if( CreateDirectoryW( wname, NULL ) == 0 )
- {
- if( GetLastError( ) == ERROR_ALREADY_EXISTS )
- errno = EEXIST;
- else
- errno = ENOENT;
- return -1;
- }
- return 0;
#else
char *locname = ToLocale( dirname );
int res;
DIR *utf8_opendir( const char *dirname )
{
#ifdef WIN32
- wchar_t wname[MAX_PATH + 1];
+ CONVERT_PATH (dirname, wpath, NULL);
+ return (DIR *)vlc_wopendir (wpath);
- if (MultiByteToWideChar (CP_UTF8, 0, dirname, -1, wname, MAX_PATH))
- {
- wname[MAX_PATH] = L'\0';
- return (DIR *)vlc_wopendir (wname);
- }
#else
const char *local_name = ToLocale( dirname );
for( i = 0; i < num; i++ )
free( tab[i] );
- if( tab != NULL )
- free( tab );
+ free( tab );
}
}
return -1;
/*_stat translates to wchar internally on WinCE*/
return _stat( filename, buf );
#elif defined (WIN32)
- /* for Windows NT and above */
- wchar_t wpath[MAX_PATH + 1];
-
- if( !MultiByteToWideChar( CP_UTF8, 0, filename, -1, wpath, MAX_PATH ) )
- {
- errno = ENOENT;
- return -1;
- }
- wpath[MAX_PATH] = L'\0';
-
- return _wstati64( wpath, buf );
+ CONVERT_PATH (filename, wpath, -1);
+ return _wstati64 (wpath, buf);
#endif
#ifdef HAVE_SYS_STAT_H
/*_open translates to wchar internally on WinCE*/
return _unlink( filename );
#elif defined (WIN32)
- /* for Windows NT and above */
- wchar_t wpath[MAX_PATH + 1];
+ CONVERT_PATH (filename, wpath, -1);
+ return _wunlink (wpath);
+
+#endif
+ const char *local_name = ToLocale( filename );
- if( !MultiByteToWideChar( CP_UTF8, 0, filename, -1, wpath, MAX_PATH ) )
+ if( local_name == NULL )
{
errno = ENOENT;
return -1;
}
- wpath[MAX_PATH] = L'\0';
- /*
- * unlink() cannot open files with non-“ANSI” characters on Windows.
- * We use _wunlink() instead.
- */
- return _wunlink( wpath );
+ int ret = unlink( local_name );
+ LocaleFree( local_name );
+ return ret;
+}
+
+/**
+ * Moves a file atomically. This only works within a single file system.
+ *
+ * @param oldpath path to the file before the move
+ * @param newpath intended path to the file after the move
+ * @return A 0 return value indicates success. A -1 return value indicates an
+ * error, and an error code is stored in errno
+ */
+int utf8_rename (const char *oldpath, const char *newpath)
+{
+#if defined (WIN32)
+ CONVERT_PATH (oldpath, wold, -1);
+ CONVERT_PATH (newpath, wnew, -1);
+# ifdef UNDER_CE
+ /* FIXME: errno support */
+ if (MoveFileW (wold, wnew))
+ return 0;
+ else
+ return -1;
+#else
+ return _wrename (wold, wnew);
#endif
- const char *local_name = ToLocale( filename );
- if( local_name == NULL )
+#endif
+ const char *lo = ToLocale (oldpath);
+ if (lo == NULL)
+ goto error;
+
+ const char *ln = ToLocale (newpath);
+ if (ln == NULL)
{
+ LocaleFree (lo);
+error:
errno = ENOENT;
return -1;
}
- int ret = unlink( local_name );
- LocaleFree( local_name );
+ int ret = rename (lo, ln);
+ LocaleFree (lo);
+ LocaleFree (ln);
return ret;
}
+
+int utf8_mkstemp( char *template )
+{
+ static const char digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ static const int i_digits = sizeof(digits)/sizeof(*digits) - 1;
+
+ /* */
+ assert( template );
+
+ /* Check template validity */
+ const size_t i_length = strlen( template );
+ char *psz_rand = &template[i_length-6];
+
+ if( i_length < 6 || strcmp( psz_rand, "XXXXXX" ) )
+ {
+ errno = EINVAL;
+ return -1;
+ }
+
+ /* */
+ for( int i = 0; i < 256; i++ )
+ {
+ /* Create a pseudo random file name */
+ uint8_t pi_rand[6];
+
+ vlc_rand_bytes( pi_rand, sizeof(pi_rand) );
+ for( int j = 0; j < 6; j++ )
+ psz_rand[j] = digits[pi_rand[j] % i_digits];
+
+ /* */
+ int fd = utf8_open( template, O_CREAT | O_EXCL | O_RDWR, 0600 );
+ if( fd >= 0 )
+ return fd;
+ if( errno != EEXIST )
+ return -1;
+ }
+
+ errno = EEXIST;
+ return -1;
+}
+
projects / vlc / blobdiff