Mercurial > audlegacy

changeset 1890:90d95cd7edb5 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - remove mkdtemp(). - if mkdtemp() is unavailable, use /tmp/audacious.SYSTEMTIME as path.
author nenolod
date Sun, 22 Oct 2006 11:54:51 -0700
parents 597bd579d9af
children 46576f74b3a1
files ChangeLog audacious/Makefile audacious/mkdtemp.c audacious/util.c audacious/util.h
diffstat 5 files changed, 21 insertions(+), 137 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Oct 22 11:38:20 2006 -0700
+++ b/ChangeLog	Sun Oct 22 11:54:51 2006 -0700
@@ -1,3 +1,17 @@
+2006-10-22 18:38:20 +0000  Derek Pomery <nemo@m8y.org>
+  revision [2735]
+  Patch by Michael Hanselmann to fetch a per-song image file.
+  
+  
+  trunk/audacious/glade/prefswin.glade |  204 +++++++++++++++++++++--------------
+  trunk/audacious/main.c               |    3 
+  trunk/audacious/main.h               |    1 
+  trunk/audacious/prefswin.c           |   93 +++++++--------
+  trunk/audacious/ui_fileinfo.c        |  136 ++++++++++++++++-------
+  trunk/audacious/ui_fileinfo.h        |    2 
+  6 files changed, 268 insertions(+), 171 deletions(-)
+
+
 2006-10-21 00:00:45 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2733]
   - enforce extern status here. we do not provide an inlined iir(), so that shouldn't be declared inline.
--- a/audacious/Makefile	Sun Oct 22 11:38:20 2006 -0700
+++ b/audacious/Makefile	Sun Oct 22 11:54:51 2006 -0700
@@ -67,7 +67,6 @@
 	softvolume.c \
 	getopt.c getopt1.c \
 	urldecode.c \
-	mkdtemp.c \
 	iir.c \
 	iir_cfs.c \
 	iir_fpu.c
--- a/audacious/mkdtemp.c	Sun Oct 22 11:38:20 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * This has been derived from the implementation in the FreeBSD libc.
- *
- * 2000-12-28  Håvard Kvålen <havardk@xmms.org>:
- * Stripped down to only mkdtemp() and made more portable
- * 
- */
-
-#ifndef HAVE_MKDTEMP
-
-#if 0
-static const char rcsid[] =
-    "$FreeBSD: /c/ncvs/src/lib/libc/stdio/mktemp.c,v 1.20 2000/11/10 23:27:55 kris Exp $";
-#endif
-
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <glib.h>
-
-static const char padchar[] =
-    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-char *
-mkdtemp(char *path)
-{
-    register char *start, *trv, *suffp;
-    char *pad;
-    struct stat sbuf;
-    int rval;
-
-    for (trv = path; *trv; ++trv);
-    suffp = trv;
-    --trv;
-    if (trv < path) {
-        errno = EINVAL;
-        return NULL;
-    }
-
-    /* Fill space with random characters */
-    /*
-     * I hope this is random enough.  The orginal implementation
-     * uses arc4random(3) which is not available everywhere.
-     */
-    while (*trv == 'X') {
-        int randv = g_random_int_range(0, sizeof(padchar) - 1);
-        *trv-- = padchar[randv];
-    }
-    start = trv + 1;
-
-    /*
-     * check the target directory.
-     */
-    for (;; --trv) {
-        if (trv <= path)
-            break;
-        if (*trv == '/') {
-            *trv = '\0';
-            rval = stat(path, &sbuf);
-            *trv = '/';
-            if (rval != 0)
-                return NULL;
-            if (!S_ISDIR(sbuf.st_mode)) {
-                errno = ENOTDIR;
-                return NULL;
-            }
-            break;
-        }
-    }
-
-    for (;;) {
-        if (mkdir(path, 0700) == 0)
-            return path;
-        if (errno != EEXIST)
-            return NULL;
-
-        /* If we have a collision, cycle through the space of filenames */
-        for (trv = start;;) {
-            if (*trv == '\0' || trv == suffp)
-                return NULL;
-            pad = strchr(padchar, *trv);
-            if (pad == NULL || !*++pad)
-                *trv++ = padchar[0];
-            else {
-                *trv++ = *pad;
-                break;
-            }
-        }
-    }
- /*NOTREACHED*/}
-
-#endif                          /* HAVE_MKDTEMP */
--- a/audacious/util.c	Sun Oct 22 11:38:20 2006 -0700
+++ b/audacious/util.c	Sun Oct 22 11:54:51 2006 -0700
@@ -309,17 +309,23 @@
 {
     gchar *tmpdir, *cmd, *escaped_filename;
     ArchiveType type;
+    mode_t mode755 = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
 
     if ((type = archive_get_type(filename)) <= ARCHIVE_DIR)
         return NULL;
 
-    tmpdir = g_build_filename(g_get_tmp_dir(), "bmp.XXXXXXXX", NULL);
+#ifdef HAVE_MKDTEMP
+    tmpdir = g_build_filename(g_get_tmp_dir(), "audacious.XXXXXXXX", NULL);
     if (!mkdtemp(tmpdir)) {
         g_free(tmpdir);
         g_message("Unable to load skin: Failed to create temporary "
                   "directory: %s", g_strerror(errno));
         return NULL;
     }
+#else
+    tmpdir = g_strdup_printf("%s/audacious.%ld", g_get_tmp_dir(), time(NULL));
+    make_directory(tmpdir, mode755);
+#endif
 
     escaped_filename = escape_shell_chars(filename);
     cmd = archive_extract_funcs[type] (escaped_filename, tmpdir);
--- a/audacious/util.h	Sun Oct 22 11:38:20 2006 -0700
+++ b/audacious/util.h	Sun Oct 22 11:54:51 2006 -0700
@@ -118,11 +118,6 @@
 GtkWidget *make_filebrowser(const gchar * title,
                             gboolean save);
 
-/* Not sure this should be here? */
-#ifndef HAVE_MKDTEMP
-char *mkdtemp(char *path);
-#endif
-
 typedef struct {
     gint x;
     gint y;