diff options
| author | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2007-11-07 15:24:26 +0000 |
|---|---|---|
| committer | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2007-11-07 15:24:26 +0000 |
| commit | 56211bd6c6b32eb61bc9df07083b891b6dffc516 (patch) | |
| tree | 0b261673ebce495acdc0466378fd22dd4e09afbe | |
| parent | fc5ee9b4f3a3ce906bef47600edc9fb88f505983 (diff) | |
| download | libgpod-56211bd6c6b32eb61bc9df07083b891b6dffc516.tar.gz libgpod-56211bd6c6b32eb61bc9df07083b891b6dffc516.tar.xz libgpod-56211bd6c6b32eb61bc9df07083b891b6dffc516.zip | |
* tools/hal-callout.c (mount_ipod): fix bug that prevented
creation of the SysInfoExtended file if it hadn't already
existed.
Add copyright header.
* tools/ipod-scsi-inquiry.c: added project name to the copyright
header.
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1762 f01d2545-417e-4e96-918e-98f8d0dbbcb6
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | tools/hal-callout.c | 32 | ||||
| -rw-r--r-- | tools/ipod-scsi-inquiry.c | 4 |
3 files changed, 44 insertions, 2 deletions
@@ -1,3 +1,13 @@ +2007-11-07 Jorg Schuler <jcsjcs at users.sourceforge.net> + + * tools/hal-callout.c (mount_ipod): fix bug that prevented + creation of the SysInfoExtended file if it hadn't already + existed. + Add copyright header. + + * tools/ipod-scsi-inquiry.c: added project name to the copyright + header. + 2007-11-06 Christophe Fergeau <teuf@gnome.org> * configure.ac: raise version number and soname in preparation for a diff --git a/tools/hal-callout.c b/tools/hal-callout.c index 5a89a57..7c4a589 100644 --- a/tools/hal-callout.c +++ b/tools/hal-callout.c @@ -1,7 +1,35 @@ +/* Copyright (c) 2007, Christophe Fergeau <teuf@gnome.org> + * Part of the libgpod project. + * + * URL: http://www.gtkpod.org/ + * URL: http://gtkpod.sourceforge.net/ + * + * The code contained in this file is free software; you can redistribute + * it and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either version + * 2.1 of the License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this code; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * iTunes and iPod are trademarks of Apple + * + * This product is not supported/written/published by Apple! + * + */ + #include <errno.h> #include <glib.h> #include <glib/gstdio.h> -#define __USE_BSD /* for mkdtemp */ +#ifndef __USE_BSD + #define __USE_BSD /* for mkdtemp */ +#endif #include <stdlib.h> #include <string.h> #include <sys/mount.h> @@ -53,7 +81,7 @@ static gboolean write_sysinfo_extended (const char *mountpoint, if (devdirpath == NULL) { return FALSE; } - filename = itdb_get_path (devdirpath, "SysInfoExtended"); + filename = g_build_filename (devdirpath, "SysInfoExtended", NULL); g_free (devdirpath); if (filename == NULL) { return FALSE; diff --git a/tools/ipod-scsi-inquiry.c b/tools/ipod-scsi-inquiry.c index 6a0fbd3..3bc88f2 100644 --- a/tools/ipod-scsi-inquiry.c +++ b/tools/ipod-scsi-inquiry.c @@ -1,4 +1,8 @@ /* Copyright (c) 2007, Christophe Fergeau <teuf@gnome.org> + * Part of the libgpod project. + * + * URL: http://www.gtkpod.org/ + * URL: http://gtkpod.sourceforge.net/ * * The code contained in this file is free software; you can redistribute * it and/or modify it under the terms of the GNU Lesser General Public |