gPhoto

Revision: 9182
          http://svn.sourceforge.net/gphoto/?rev=9182&view=rev
Author:   hun
Date:     2006-09-18 15:13:27 -0700 (Mon, 18 Sep 2006)

Log Message:
-----------
fix hotplug output: check (a->port & GP_PORT_USB) before reading any USB values

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-09-18 22:09:52 UTC (rev 9181)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-09-18 22:13:27 UTC (rev 9182)
@@ -150,28 +150,31 @@
 		?((*params->argv)[0])
 		:(GP_USB_HOTPLUG_SCRIPT);
 
-	if (a->usb_vendor) { /* usb product id may be zero! */
-		class = 0;
-		subclass = 0;
-		proto = 0;
-		flags = GP_USB_HOTPLUG_MATCH_VENDOR_ID | GP_USB_HOTPLUG_MATCH_PRODUCT_ID;
-		usb_vendor = a->usb_vendor;
-		usb_product = a->usb_product;
-	} else if (a->usb_class) {
-		class = a->usb_class;
-		subclass = a->usb_subclass;
-		proto = a->usb_protocol;
-		flags = GP_USB_HOTPLUG_MATCH_INT_CLASS;
-		if (subclass != -1)
-			flags |= GP_USB_HOTPLUG_MATCH_INT_SUBCLASS;
-		else
+	if (a->port & GP_PORT_USB) {
+		if (a->usb_vendor) { /* usb product id may be zero! */
+			class = 0;
 			subclass = 0;
-		if (proto != -1)
-			flags |= GP_USB_HOTPLUG_MATCH_INT_PROTOCOL;
-		else
 			proto = 0;
-		usb_vendor = 0;
-		usb_product = 0;
+			flags = (GP_USB_HOTPLUG_MATCH_VENDOR_ID 
+				 | GP_USB_HOTPLUG_MATCH_PRODUCT_ID);
+			usb_vendor = a->usb_vendor;
+			usb_product = a->usb_product;
+		} else if (a->usb_class) {
+			class = a->usb_class;
+			subclass = a->usb_subclass;
+			proto = a->usb_protocol;
+			flags = GP_USB_HOTPLUG_MATCH_INT_CLASS;
+			if (subclass != -1)
+				flags |= GP_USB_HOTPLUG_MATCH_INT_SUBCLASS;
+			else
+				subclass = 0;
+			if (proto != -1)
+				flags |= GP_USB_HOTPLUG_MATCH_INT_PROTOCOL;
+			else
+				proto = 0;
+			usb_vendor = 0;
+			usb_product = 0;
+		}
 	} else {
 		/* not a USB camera */
 		return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9188
          http://svn.sourceforge.net/gphoto/?rev=9188&view=rev
Author:   hun
Date:     2006-09-19 03:02:28 -0700 (Tue, 19 Sep 2006)

Log Message:
-----------
blacklist usb_class 666

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-09-19 02:18:28 UTC (rev 9187)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-09-19 10:02:28 UTC (rev 9188)
@@ -159,7 +159,7 @@
 				 | GP_USB_HOTPLUG_MATCH_PRODUCT_ID);
 			usb_vendor = a->usb_vendor;
 			usb_product = a->usb_product;
-		} else if (a->usb_class) {
+		} else if ((a->usb_class) && (a->usb_class != 666)) {
 			class = a->usb_class;
 			subclass = a->usb_subclass;
 			proto = a->usb_protocol;
@@ -333,7 +333,7 @@
 				 | GP_USB_HOTPLUG_MATCH_PRODUCT_ID);
 			usb_vendor = a->usb_vendor;
 			usb_product = a->usb_product;
-		} else if (a->usb_class) {
+		} else if ((a->usb_class) && (a->usb_class != 666)) {
 			class = a->usb_class;
 			subclass = a->usb_subclass;
 			proto = a->usb_protocol;
@@ -444,7 +444,7 @@
 				 | GP_USB_HOTPLUG_MATCH_PRODUCT_ID);
 			usb_vendor = a->usb_vendor;
 			usb_product = a->usb_product;
-		} else if (a->usb_class) {
+		} else if ((a->usb_class) && (a->usb_class != 666)) {
 			class = a->usb_class;
 			subclass = a->usb_subclass;
 			proto = a->usb_protocol;
@@ -658,7 +658,7 @@
 			printf("        vendor  0x%04x;\n", a->usb_vendor);
 			printf("        product 0x%04x;\n", a->usb_product);
 		}
-		if (a->usb_class) {
+		if ((a->usb_class) && (a->usb_class != 666)) {
 			printf("        class 0x%02x;\n", a->usb_class);
 			if (a->usb_subclass != -1) {
 				printf("        subclass 0x%02x;\n", a->usb_subclass);
@@ -769,7 +769,7 @@
 			printf("    </match>\n");
 			printf("   </match>\n");
 			
-		} else if (a->usb_class) {
+		} else if ((a->usb_class) && (a->usb_class != 666)) {
 			printf("   <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
 			printf("    <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
 			printf("     <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);
@@ -875,7 +875,7 @@
 		}
 #if 0
 		/* would need to be able to merge upwards ... but cannot currently */
-		else if (a->usb_class) {
+		else if ((a->usb_class) && (a->usb_class != 666)) {
 			printf("   <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class);
 			printf("    <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass);
 			printf("     <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9192
          http://svn.sourceforge.net/gphoto/?rev=9192&view=rev
Author:   hun
Date:     2006-09-19 08:37:53 -0700 (Tue, 19 Sep 2006)

Log Message:
-----------
fix a few corner cases generating gp2ddb output

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-09-19 15:36:46 UTC (rev 9191)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-09-19 15:37:53 UTC (rev 9192)
@@ -574,15 +574,15 @@
 }
 
 
-static int
-ddb_camera_func (const func_params_t *params, 
-		 const int i,
-		 const int total,
-		 const CameraAbilities *a)
+static void
+ddb_delayed_head(
+	const func_params_t *params, 
+	const int i,
+	const int total,
+	const CameraAbilities *a,
+	const char *camlib_basename)
 {
 	int first = 1;
-	const char *camlib_basename = basename(a->library);
-
 	printf("# This is a PRE-ALPHA data format. Do not use it.\n\n");
 
 	if (params->add_comments) {
@@ -633,9 +633,29 @@
 				 ddb_list_out_func,
 				 (void *) &first);
 	printf(";\n");
+}
 
+
+static int
+ddb_camera_func (const func_params_t *params, 
+		 const int i,
+		 const int total,
+		 const CameraAbilities *a)
+{
+	const char *camlib_basename = basename(a->library);
+	int head_printed = 0;
+#define DELAYED_HEAD() \
+	do { \
+		if (!head_printed) {			      \
+			ddb_delayed_head(params, i, total,    \
+					 a, camlib_basename); \
+			head_printed = 1;		      \
+		} \
+	} while (0)
+
 	if ((a->port & GP_PORT_SERIAL)) {
 		int first = 1;
+		DELAYED_HEAD();
 		printf("    interface serial {\n");
 		if (a->speed[0] != 0) {
 			unsigned int i;
@@ -652,13 +672,17 @@
 	}
 
 	if ((a->port & GP_PORT_USB)) {
-		printf("    interface usb {\n");
 		if (a->usb_vendor) { 
 			/* usb product id may have the legal value zero! */
+			DELAYED_HEAD();
+			printf("    interface usb {\n");
 			printf("        vendor  0x%04x;\n", a->usb_vendor);
 			printf("        product 0x%04x;\n", a->usb_product);
+			printf("    };\n");
 		}
 		if ((a->usb_class) && (a->usb_class != 666)) {
+			DELAYED_HEAD();
+			printf("    interface usb {\n");
 			printf("        class 0x%02x;\n", a->usb_class);
 			if (a->usb_subclass != -1) {
 				printf("        subclass 0x%02x;\n", a->usb_subclass);
@@ -666,22 +690,27 @@
 			if (a->usb_protocol != -1) {
 				printf("        protocol 0x%02x;\n", a->usb_protocol);
 			}
+			printf("    };\n");
 		}
-		printf("    };\n");
 	}
 	if ((a->port & GP_PORT_DISK)) {
+		DELAYED_HEAD();
 		printf("    interface disk;\n");
 	}
 	if ((a->port & GP_PORT_PTPIP)) {
+		DELAYED_HEAD();
 		printf("    interface ptpip;\n");
 	}
+#undef DELAYED_HEAD
 
-	printf("    # driver_options {\n");
-	printf("    #      option \"foo\";\n");
-	printf("    #      option \"bar\" \"bla\";\n");
-	printf("    # };\n");
+	if (head_printed) {
+		printf("    # driver_options {\n");
+		printf("    #      option \"foo\";\n");
+		printf("    #      option \"bar\" \"bla\";\n");
+		printf("    # };\n");
 
-	printf("}; # %s\n\n", a->model);
+		printf("}; # %s\n\n", a->model);
+	}
 	return 0;
 }
 
@@ -1088,10 +1117,11 @@
 	static char *fmt_argv[16]; /* format specific arguments */
 
 	int i, j;
+	unsigned int ui;
 
 	/* initialize parameters to NULL */
-	for (i=0; i<(sizeof(fmt_argv)/sizeof(fmt_argv[0])); i++) {
-		fmt_argv[i] = NULL;
+	for (ui=0; ui<(sizeof(fmt_argv)/sizeof(fmt_argv[0])); ui++) {
+		fmt_argv[ui] = NULL;
 	}
 
 	/* walk through command line arguments until format is encountered */
@@ -1136,7 +1166,7 @@
 
 	/* copy remaining arguments */
 	for (j=i; 
-	     (j<argc) && ((j-i)<((sizeof(fmt_argv)/sizeof(fmt_argv[0]))-1)); 
+	     (j<argc) && ((j-i)<(int)((sizeof(fmt_argv)/sizeof(fmt_argv[0]))-1)); 
 	     j++) {
 		fmt_argv[j-i] = argv[j];
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9376
          http://svn.sourceforge.net/gphoto/?rev=9376&view=rev
Author:   marcusmeissner
Date:     2006-10-30 09:07:23 -0800 (Mon, 30 Oct 2006)

Log Message:
-----------
align portable_audio_player subfields with HAL ones.

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-10-26 08:41:08 UTC (rev 9375)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-10-30 17:07:23 UTC (rev 9376)
@@ -770,8 +770,8 @@
 				printf("     <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
 				printf("     <merge key=\"info.category\" type=\"string\">portable_audio_player</merge>\n");
 				printf("     <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
-				printf("     <merge key=\"portable_audio_player.access_method\" type=\"string\">libgphoto2</merge>\n");
-				printf("     <merge key=\"portable_audio_player.type\" type=\"string\">user</merge>\n");
+				printf("     <merge key=\"portable_audio_player.access_method\" type=\"string\">user</merge>\n");
+				printf("     <merge key=\"portable_audio_player.type\" type=\"string\">mtp</merge>\n");
 				
 				/* FIXME: needs true formats ... But all of them can do MP3 */
 				printf("     <append key=\"portable_audio_player.output_formats\" type=\"strlist\">audio/mpeg</append>\n");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9390
          http://svn.sourceforge.net/gphoto/?rev=9390&view=rev
Author:   marcusmeissner
Date:     2006-11-09 04:50:13 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
fixed the interface class matcher to actually work.

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-11-08 21:40:47 UTC (rev 9389)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-11-09 12:50:13 UTC (rev 9390)
@@ -351,13 +351,10 @@
 	}
 
 	if (flags & GP_USB_HOTPLUG_MATCH_INT_CLASS) {
-		printf("SYSFS{bInterfaceClass}==\"%02x\", ", class);
-		if (flags & GP_USB_HOTPLUG_MATCH_INT_SUBCLASS) {
-			printf("SYSFS{bInterfaceSubClass}==\"%02x\", ", subclass);
-		}
-		if (flags & GP_USB_HOTPLUG_MATCH_INT_PROTOCOL) {
-			printf("SYSFS{bInterfaceProtocol}==\"%02x\", ", proto);
-			}
+		if ((flags & (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) == (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL))
+			printf("ENV{INTERFACE}==\"%d/%d/%d\", ", class, subclass, proto);
+		else
+			fprintf(stderr,"unhandled interface match flags %x\n", flags);
 	} else {
 		printf ("SYSFS{idVendor}==\"%04x\", SYSFS{idProduct}==\"%04x\", ",
 			a->usb_vendor, a->usb_product);
@@ -461,11 +458,10 @@
 		printf ("# %s\n", a->model);
 
 	if (flags & GP_USB_HOTPLUG_MATCH_INT_CLASS) {
-		printf("ATTRS{bInterfaceClass}==\"%02x\", ", class);
-		if (flags & GP_USB_HOTPLUG_MATCH_INT_SUBCLASS)
-			printf("ATTRS{bInterfaceSubClass}==\"%02x\", ", subclass);
-		if (flags & GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)
-			printf("ATTRS{bInterfaceProtocol}==\"%02x\", ", proto);
+		if ((flags & (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) == (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL))
+			printf("ENV{INTERFACE}==\"%d/%d/%d\", ", class, subclass, proto);
+		else
+			fprintf(stderr,"unhandled interface match flags %x\n", flags);
 	} else {
 		printf ("ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ",
 			a->usb_vendor, a->usb_product);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9515
          http://svn.sourceforge.net/gphoto/?rev=9515&view=rev
Author:   marcusmeissner
Date:     2006-12-07 06:53:22 -0800 (Thu, 07 Dec 2006)

Log Message:
-----------
generate interface matchers using check_ptp_camera

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-07 14:38:56 UTC (rev 9514)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-07 14:53:22 UTC (rev 9515)
@@ -352,7 +352,7 @@
 
 	if (flags & GP_USB_HOTPLUG_MATCH_INT_CLASS) {
 		if ((flags & (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) == (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL))
-			printf("ENV{INTERFACE}==\"%d/%d/%d\", ", class, subclass, proto);
+			printf("PROGRAM=\"check_ptp_camera %02d/%02d/%02d\", ", class, subclass, proto);
 		else
 			fprintf(stderr,"unhandled interface match flags %x\n", flags);
 	} else {
@@ -459,7 +459,7 @@
 
 	if (flags & GP_USB_HOTPLUG_MATCH_INT_CLASS) {
 		if ((flags & (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) == (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL))
-			printf("ENV{INTERFACE}==\"%d/%d/%d\", ", class, subclass, proto);
+			printf("PROGRAM=\"check_ptp_camera %02d/%02d/%02d\", ", class, subclass, proto);
 		else
 			fprintf(stderr,"unhandled interface match flags %x\n", flags);
 	} else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9517
          http://svn.sourceforge.net/gphoto/?rev=9517&view=rev
Author:   marcusmeissner
Date:     2006-12-07 07:50:20 -0800 (Thu, 07 Dec 2006)

Log Message:
-----------
make the udev rules description better and match current state

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-07 15:49:15 UTC (rev 9516)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-07 15:50:20 UTC (rev 9517)
@@ -1022,7 +1022,7 @@
 	},
 	{name: "udev-rules",
 	 descr: "udev < 0.98 rules file",
-	 help: "Put it into /etc/udev/libgphoto2.rules, set file mode, owner, group or add script to run",
+	 help: "Put it into /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n        or add script to run. This rule files also uses the\n        check_ptp_camera script included in libgphoto2 source. Either put it to\n        /lib/udev/check_ptp_camera or adjust the path in the generated rules file.",
 	 paramdescr: "( <PATH_TO_SCRIPT> | [mode <mode>|owner <owner>|group <group>]* ) ",
 	 begin_func: udev_begin_func, 
 	 camera_func: udev_camera_func,
@@ -1030,7 +1030,7 @@
 	},
 	{name: "udev-rules-0.98",
 	 descr: "udev >= 0.98 rules file",
-	 help: "Put it into /etc/udev/libgphoto2.rules, set file mode, owner, group or add script to run, for udev >= 0.98",
+	 help: "Put it into /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n        or add script to run, for udev >= 0.98. This rule files also uses the\n        check_ptp_camera script included in libgphoto2 source. Either put it to\n        /lib/udev/check_ptp_camera or adjust the path in the generated rules file.",
 	 paramdescr: "( <PATH_TO_SCRIPT> | [mode <mode>|owner <owner>|group <group>]* ) ",
 	 begin_func: udev_098_begin_func, 
 	 camera_func: udev_098_camera_func,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9535
          http://svn.sourceforge.net/gphoto/?rev=9535&view=rev
Author:   marcusmeissner
Date:     2006-12-08 04:59:14 -0800 (Fri, 08 Dec 2006)

Log Message:
-----------
correct OR the 2 conditions (2 lines).
use SUBSYSTEM="usb*" to be sure we get the right ones

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-08 09:52:34 UTC (rev 9534)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-08 12:59:14 UTC (rev 9535)
@@ -284,7 +284,11 @@
 udev_begin_func (const func_params_t *params)
 {
 	printf ("# udev rules file for libgphoto2 devices (udev < 0.98)\n#\n");
-	printf ("BUS!=\"usb\", ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n");
+	/* Note: 2 lines because we need to use || ... having them on the same
+	 * line would mean &&.
+	 */
+	printf ("BUS!=\"usb*\", GOTO=\"libgphoto2_rules_end\"\n");
+	printf ("ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n");
 	return 0;
 }
 
@@ -292,7 +296,11 @@
 udev_098_begin_func (const func_params_t *params)
 {
 	printf ("# udev rules file for libgphoto2 devices (udev >= 0.98)\n#\n");
-	printf ("SUBSYSTEMS!=\"usb\", ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n");
+	/* Note: 2 lines because we need to use || ... having them on the same
+	 * line would mean &&.
+	 */
+	printf ("SUBSYSTEM!=\"usb*\", GOTO=\"libgphoto2_rules_end\"\n");
+	printf ("ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n");
 	return 0;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9568
          http://svn.sourceforge.net/gphoto/?rev=9568&view=rev
Author:   hun
Date:     2006-12-11 07:57:59 -0800 (Mon, 11 Dec 2006)

Log Message:
-----------
Check size of fixed buffer in print-camera-list

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-11 15:57:04 UTC (rev 9567)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-11 15:57:59 UTC (rev 9568)
@@ -931,7 +931,7 @@
 
 	s = (char *) a->model;
 	d = model;
-	while (*s) {
+	while (*s && (d < &d[sizeof(d)-1])) {
 		if (*s == '&') {
 			strcpy(d,"&amp;");
 			d += strlen(d);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9578
          http://svn.sourceforge.net/gphoto/?rev=9578&view=rev
Author:   hun
Date:     2006-12-11 08:52:38 -0800 (Mon, 11 Dec 2006)

Log Message:
-----------
Add comment header for linux-hotplug output

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-11 16:33:20 UTC (rev 9577)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-11 16:52:38 UTC (rev 9578)
@@ -177,6 +177,19 @@
 	} while (0)
 
 
+
+static int
+hotplug_begin_func (const func_params_t *params)
+{
+	if (params->add_comments) {
+		printf("# linux-hotplug configuration file "
+		       "for libgphoto2 supported devices\n");
+		print_version_comment(stdout, "# ", "\n", NULL, "#\n");
+	}
+	return 0;
+}
+
+
 /* print_usb_usermap
  *
  * Print out lines that can be included into usb.usermap 
@@ -1078,7 +1091,7 @@
 	 help: "If no <scriptname> is given, uses the script name "
 	 "\"" GP_USB_HOTPLUG_SCRIPT "\".\n        Put this into /etc/hotplug/usb/<scriptname>.usermap",
 	 paramdescr: "<NAME_OF_HOTPLUG_SCRIPT>",
-	 begin_func: empty_begin_func,
+	 begin_func: hotplug_begin_func,
 	 camera_func: hotplug_camera_func,
 	 end_func: empty_end_func
 	},


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9579
          http://svn.sourceforge.net/gphoto/?rev=9579&view=rev
Author:   hun
Date:     2006-12-11 08:57:27 -0800 (Mon, 11 Dec 2006)

Log Message:
-----------
Reformatting of code/strings

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-11 16:52:38 UTC (rev 9578)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-11 16:57:27 UTC (rev 9579)
@@ -76,48 +76,6 @@
 	{ NULL, NULL }
 };
 
-/* print_version_comment
- * Print comment to output containing information on library versions
- *
- * out        the file to write the comment to
- * startline  printed at the start of each line, e.g. "# " or "    | "
- * endline    printed as the end of each line,   e.g. "\n" or "\n"
- * firstline  printed before first line,         e.g. NULL or "<!--+\n"
- * lastline   printed after last line,           e.g. "\n" or "    +-->\n"
- */
-
-static void
-print_version_comment(FILE *out,
-		      const char *startline, const char *endline,
-		      const char *firstline, const char *lastline)
-{
-	unsigned int n;
-	if (firstline != NULL) { fputs(firstline, out); }
-	fputs(startline, out);
-	fputs("Created from this library:", out);
-	fputs(endline, out);
-	for (n=0; (module_versions[n].name != NULL) && (module_versions[n].version_func != NULL); n++) {
-		const char *name = module_versions[n].name;
-		GPVersionFunc func = module_versions[n].version_func;
-		const char **v = func(GP_VERSION_SHORT);
-		unsigned int i;
-		if (!v) { continue; }
-		if (!v[0]) { continue; }
-		fputs(startline, out);
-		fputs("  ", out);
-		fprintf(out,"%-15s %-14s ", name, v[0]);
-		for (i=1; v[i] != NULL; i++) {
-			fputs(v[i], out);
-			if (v[i+1] != NULL) {
-				fputs(", ", out);
-			}
-		}
-		fputs(endline, out);
-	}
-	if (lastline != NULL) { fputs(lastline, out); }
-}
-
-
 typedef char *string_array_t[];
 
 typedef string_array_t *string_array_p;
@@ -177,7 +135,49 @@
 	} while (0)
 
 
+/* print_version_comment
+ * Print comment to output containing information on library versions
+ *
+ * out        the file to write the comment to
+ * startline  printed at the start of each line, e.g. "# " or "    | "
+ * endline    printed as the end of each line,   e.g. "\n" or "\n"
+ * firstline  printed before first line,         e.g. NULL or "<!--+\n"
+ * lastline   printed after last line,           e.g. "\n" or "    +-->\n"
+ */
 
+static void
+print_version_comment(FILE *out,
+		      const char *startline, const char *endline,
+		      const char *firstline, const char *lastline)
+{
+	unsigned int n;
+	if (out == NULL) { FATAL("Internal error: NULL out in print_version_comment()"); }
+	if (firstline != NULL) { fputs(firstline, out); }
+	fputs(startline, out);
+	fputs("Created from this library:", out);
+	fputs(endline, out);
+	for (n=0; (module_versions[n].name != NULL) && (module_versions[n].version_func != NULL); n++) {
+		const char *name = module_versions[n].name;
+		GPVersionFunc func = module_versions[n].version_func;
+		const char **v = func(GP_VERSION_SHORT);
+		unsigned int i;
+		if (!v) { continue; }
+		if (!v[0]) { continue; }
+		if (startline != NULL) { fputs(startline, out); }
+		fputs("  ", out);
+		fprintf(out,"%-15s %-14s ", name, v[0]);
+		for (i=1; v[i] != NULL; i++) {
+			fputs(v[i], out);
+			if (v[i+1] != NULL) {
+				fputs(", ", out);
+			}
+		}
+		if (endline != NULL) { fputs(endline, out); }
+	}
+	if (lastline != NULL) { fputs(lastline, out); }
+}
+
+
 static int
 hotplug_begin_func (const func_params_t *params)
 {
@@ -1088,8 +1088,10 @@
 	},
 	{name: "usb-usermap",
 	 descr: "usb.usermap include file for linux-hotplug",
-	 help: "If no <scriptname> is given, uses the script name "
-	 "\"" GP_USB_HOTPLUG_SCRIPT "\".\n        Put this into /etc/hotplug/usb/<scriptname>.usermap",
+	 help:
+	 "If no <scriptname> is given, uses the script name "
+	 "\"" GP_USB_HOTPLUG_SCRIPT "\".\n"
+	 "        Put this into /etc/hotplug/usb/<scriptname>.usermap",
 	 paramdescr: "<NAME_OF_HOTPLUG_SCRIPT>",
 	 begin_func: hotplug_begin_func,
 	 camera_func: hotplug_camera_func,
@@ -1113,7 +1115,10 @@
 	},
 	{name: "udev-rules",
 	 descr: "udev < 0.98 rules file",
-	 help: "Put it into /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n        or add script to run. This rule files also uses the\n        check_ptp_camera script included in libgphoto2 source. Either put it to\n        /lib/udev/check_ptp_camera or adjust the path in the generated rules file.",
+	 help: "Put it into /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n"
+	 "        or add script to run. This rule files also uses the\n"
+	 "        check_ptp_camera script included in libgphoto2 source. Either put it to\n"
+	 "        /lib/udev/check_ptp_camera or adjust the path in the generated rules file.",
 	 paramdescr: "( <PATH_TO_SCRIPT> | [mode <mode>|owner <owner>|group <group>]* ) ",
 	 begin_func: udev_begin_func, 
 	 camera_func: udev_camera_func,
@@ -1121,7 +1126,11 @@
 	},
 	{name: "udev-rules-0.98",
 	 descr: "udev >= 0.98 rules file",
-	 help: "Put it into /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n        or add script to run, for udev >= 0.98. This rule files also uses the\n        check_ptp_camera script included in libgphoto2 source. Either put it to\n        /lib/udev/check_ptp_camera or adjust the path in the generated rules file.",
+	 help:
+	 "Put it into /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n"
+	 "        or add script to run, for udev >= 0.98. This rule files also uses the\n"
+	 "        check_ptp_camera script included in libgphoto2 source. Either put it to\n"
+	 "        /lib/udev/check_ptp_camera or adjust the path in the generated rules file.",
 	 paramdescr: "( <PATH_TO_SCRIPT> | [mode <mode>|owner <owner>|group <group>]* ) ",
 	 begin_func: udev_098_begin_func, 
 	 camera_func: udev_098_camera_func,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9612
          http://svn.sourceforge.net/gphoto/?rev=9612&view=rev
Author:   marcusmeissner
Date:     2006-12-15 14:00:11 -0800 (Fri, 15 Dec 2006)

Log Message:
-----------
check_mtp_device not working yet

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-15 21:51:35 UTC (rev 9611)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-15 22:00:11 UTC (rev 9612)
@@ -436,7 +436,7 @@
 			printf("PROGRAM=\"check_ptp_camera %02d/%02d/%02d\", ", class, subclass, proto);
 		} else {
 			if (class == 666) {
-				printf("PROGRAM=\"check_mtp_device\", ");
+				printf("# not working yet: PROGRAM=\"check_mtp_device\", ");
 			} else {
 				fprintf(stderr,"unhandled interface match flags %x\n", flags);
 			}
@@ -547,7 +547,7 @@
 			printf("PROGRAM=\"check_ptp_camera %02d/%02d/%02d\", ", class, subclass, proto);
 		} else {
 			if (class == 666)
-				printf("PROGRAM=\"check_mtp_device\", ");
+				printf("# not working yet: PROGRAM=\"check_mtp_device\", ");
 			else
 				fprintf(stderr,"unhandled interface match flags %x\n", flags);
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9636
          http://svn.sourceforge.net/gphoto/?rev=9636&view=rev
Author:   hun
Date:     2006-12-17 06:32:44 -0800 (Sun, 17 Dec 2006)

Log Message:
-----------
rename utilities to all use hyphens instead of underscores

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-17 14:29:50 UTC (rev 9635)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-17 14:32:44 UTC (rev 9636)
@@ -433,10 +433,10 @@
 
 	if (flags & GP_USB_HOTPLUG_MATCH_INT_CLASS) {
 		if ((flags & (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) == (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) {
-			printf("PROGRAM=\"check_ptp_camera %02d/%02d/%02d\", ", class, subclass, proto);
+			printf("PROGRAM=\"check-ptp-camera %02d/%02d/%02d\", ", class, subclass, proto);
 		} else {
 			if (class == 666) {
-				printf("# not working yet: PROGRAM=\"check_mtp_device\", ");
+				printf("# not working yet: PROGRAM=\"check-mtp-device\", ");
 			} else {
 				fprintf(stderr,"unhandled interface match flags %x\n", flags);
 			}
@@ -544,10 +544,10 @@
 
 	if (flags & GP_USB_HOTPLUG_MATCH_INT_CLASS) {
 		if ((flags & (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) == (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) {
-			printf("PROGRAM=\"check_ptp_camera %02d/%02d/%02d\", ", class, subclass, proto);
+			printf("PROGRAM=\"check-ptp-camera %02d/%02d/%02d\", ", class, subclass, proto);
 		} else {
 			if (class == 666)
-				printf("# not working yet: PROGRAM=\"check_mtp_device\", ");
+				printf("# not working yet: PROGRAM=\"check-mtp-device\", ");
 			else
 				fprintf(stderr,"unhandled interface match flags %x\n", flags);
 		}
@@ -1125,8 +1125,8 @@
 	 descr: "udev < 0.98 rules file",
 	 help: "Put it into /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n"
 	 "        or add script to run. This rule files also uses the\n"
-	 "        check_ptp_camera script included in libgphoto2 source. Either put it to\n"
-	 "        /lib/udev/check_ptp_camera or adjust the path in the generated rules file.",
+	 "        check-ptp-camera script included in libgphoto2 source. Either put it to\n"
+	 "        /lib/udev/check-ptp-camera or adjust the path in the generated rules file.",
 	 paramdescr: "( <PATH_TO_SCRIPT> | [mode <mode>|owner <owner>|group <group>]* ) ",
 	 begin_func: udev_begin_func, 
 	 camera_func: udev_camera_func,
@@ -1137,8 +1137,8 @@
 	 help:
 	 "Put it into /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n"
 	 "        or add script to run, for udev >= 0.98. This rule files also uses the\n"
-	 "        check_ptp_camera script included in libgphoto2 source. Either put it to\n"
-	 "        /lib/udev/check_ptp_camera or adjust the path in the generated rules file.",
+	 "        check-ptp-camera script included in libgphoto2 source. Either put it to\n"
+	 "        /lib/udev/check-ptp-camera or adjust the path in the generated rules file.",
 	 paramdescr: "( <PATH_TO_SCRIPT> | [mode <mode>|owner <owner>|group <group>]* ) ",
 	 begin_func: udev_098_begin_func, 
 	 camera_func: udev_098_camera_func,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9751
          http://svn.sourceforge.net/gphoto/?rev=9751&view=rev
Author:   hun
Date:     2006-12-28 02:04:13 -0800 (Thu, 28 Dec 2006)

Log Message:
-----------
Mark return type as const when returning const char *

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-28 10:02:44 UTC (rev 9750)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2006-12-28 10:04:13 UTC (rev 9751)
@@ -466,7 +466,7 @@
 	*foo = str;
 }
 
-static inline char *
+static inline const char *
 get_version_str(udev_version_t version)
 {
 	return gpi_enum_to_string(version, udev_version_t_map);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9854
          http://svn.sourceforge.net/gphoto/?rev=9854&view=rev
Author:   marcusmeissner
Date:     2007-01-06 08:04:11 -0800 (Sat, 06 Jan 2007)

Log Message:
-----------
recommend 20thirdparty instead of 10freedesktop

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-01-03 21:35:29 UTC (rev 9853)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-01-06 16:04:11 UTC (rev 9854)
@@ -1089,7 +1089,7 @@
 	},
 	{name: "hal-fdi",
 	 descr: "fdi file for HAL",
-	 help: "Put it into /usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi",
+	 help: "Put it into /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi",
 	 paramdescr: NULL,
 	 begin_func: fdi_begin_func,
 	 camera_func: fdi_camera_func,
@@ -1097,7 +1097,7 @@
 	},
 	{name: "hal-fdi-device",
 	 descr: "fdi device file for HAL",
-	 help: "Put it into /usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2-device.fdi",
+	 help: "Put it into /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi",
 	 paramdescr: NULL,
 	 begin_func: fdi_device_begin_func,
 	 camera_func: fdi_device_camera_func,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9959
          http://svn.sourceforge.net/gphoto/?rev=9959&view=rev
Author:   marcusmeissner
Date:     2007-01-31 07:46:18 -0800 (Wed, 31 Jan 2007)

Log Message:
-----------
explicitly make sure USB vendor is not 0 before dumping it.

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-01-31 14:44:39 UTC (rev 9958)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-01-31 15:46:18 UTC (rev 9959)
@@ -562,8 +562,8 @@
 			}
 		}
 	} else {
-		printf (pdata->usbcam_string,
-			a->usb_vendor, a->usb_product);
+		if (a->usb_vendor)
+			printf (pdata->usbcam_string, a->usb_vendor, a->usb_product);
 	}
 	if (pdata->script != NULL) {
 		printf("RUN+=\"%s\"\n", pdata->script);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9973
          http://svn.sourceforge.net/gphoto/?rev=9973&view=rev
Author:   marcusmeissner
Date:     2007-02-04 02:45:56 -0800 (Sun, 04 Feb 2007)

Log Message:
-----------
check harder that we have correct vendor/product matches

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-02-04 10:39:39 UTC (rev 9972)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-02-04 10:45:56 UTC (rev 9973)
@@ -562,8 +562,12 @@
 			}
 		}
 	} else {
-		if (a->usb_vendor)
+		if (flags & GP_USB_HOTPLUG_MATCH_VENDOR_ID)
 			printf (pdata->usbcam_string, a->usb_vendor, a->usb_product);
+		else
+			fprintf (stderr, "Error: Trying to output device %d/%d with incorrect match flags.\n",
+				a->usb_vendor, a->usb_product
+			);
 	}
 	if (pdata->script != NULL) {
 		printf("RUN+=\"%s\"\n", pdata->script);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10011
          http://svn.sourceforge.net/gphoto/?rev=10011&view=rev
Author:   marcusmeissner
Date:     2007-02-18 12:59:31 -0800 (Sun, 18 Feb 2007)

Log Message:
-----------
trigger on usb_device only, this is the main device with vendor/product
id.

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-02-18 18:48:18 UTC (rev 10010)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-02-18 20:59:31 UTC (rev 10011)
@@ -441,10 +441,10 @@
 	 */
 	static char *begin_strings[] = {
 		/* UDEV_PRE_0_98 */
-		"BUS!=\"usb*\", GOTO=\"libgphoto2_rules_end\"\n"
+		"BUS!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
 		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n",
 		/* UDEV_0_98 */
-		"SUBSYSTEM!=\"usb*\", GOTO=\"libgphoto2_rules_end\"\n"
+		"SUBSYSTEM!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
 		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n"
 	};
 	static char *usbcam_strings[] = {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10088
          http://svn.sourceforge.net/gphoto/?rev=10088&view=rev
Author:   marcusmeissner
Date:     2007-04-19 08:25:37 -0700 (Thu, 19 Apr 2007)

Log Message:
-----------
Do not report the MTP devices as cameras.

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-04-18 20:32:51 UTC (rev 10087)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-04-19 15:25:37 UTC (rev 10088)
@@ -840,9 +840,7 @@
 		if (a->usb_vendor) { /* usb product id might be 0! */
 			printf("   <match key=\"usb.vendor_id\" int=\"%d\">\n", a->usb_vendor);
 			printf("    <match key=\"usb.product_id\" int=\"%d\">\n", a->usb_product);
-			printf("     <merge key=\"info.category\" type=\"string\">camera</merge>\n");
 			if (a->device_type & GP_DEVICE_AUDIO_PLAYER) {
-				printf("     <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
 				printf("     <merge key=\"info.category\" type=\"string\">portable_audio_player</merge>\n");
 				printf("     <append key=\"info.capabilities\" type=\"strlist\">portable_audio_player</append>\n");
 				printf("     <merge key=\"portable_audio_player.access_method\" type=\"string\">user</merge>\n");
@@ -851,6 +849,7 @@
 				/* FIXME: needs true formats ... But all of them can do MP3 */
 				printf("     <append key=\"portable_audio_player.output_formats\" type=\"strlist\">audio/mpeg</append>\n");
 			} else {
+				printf("     <merge key=\"info.category\" type=\"string\">camera</merge>\n");
 				printf("     <append key=\"info.capabilities\" type=\"strlist\">camera</append>\n");
 				
 				/* HACK alert ... but the HAL / gnome-volume-manager guys want that */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10097
          http://svn.sourceforge.net/gphoto/?rev=10097&view=rev
Author:   marcusmeissner
Date:     2007-05-01 02:04:45 -0700 (Tue, 01 May 2007)

Log Message:
-----------
make it build with stone age compilers.

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-04-28 11:22:39 UTC (rev 10096)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-05-01 09:04:45 UTC (rev 10097)
@@ -1071,69 +1071,68 @@
 
 /** list of supported output formats */
 static const output_format_t formats[] = {
-	{name: "human-readable",
-	 descr: "human readable list of cameras",
-	 help: NULL,
-	 paramdescr: NULL,
-	 begin_func: human_begin_func,
-	 camera_func: human_camera_func,
-	 end_func: human_end_func
+	{"human-readable",
+	 "human readable list of cameras",
+	 NULL,
+	 NULL,
+	 human_begin_func,
+	 human_camera_func,
+	 human_end_func
 	},
-	{name: "usb-usermap",
-	 descr: "usb.usermap include file for linux-hotplug",
-	 help:
+	{"usb-usermap",
+	 "usb.usermap include file for linux-hotplug",
 	 "If no <scriptname> is given, uses the script name "
 	 "\"" GP_USB_HOTPLUG_SCRIPT "\".\n"
 	 "        Put this into /etc/hotplug/usb/<scriptname>.usermap",
-	 paramdescr: "<NAME_OF_HOTPLUG_SCRIPT>",
-	 begin_func: hotplug_begin_func,
-	 camera_func: hotplug_camera_func,
-	 end_func: empty_end_func
+	 "<NAME_OF_HOTPLUG_SCRIPT>",
+	 hotplug_begin_func,
+	 hotplug_camera_func,
+	 empty_end_func
 	},
-	{name: "hal-fdi",
-	 descr: "fdi file for HAL",
-	 help: "Put it into /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi",
-	 paramdescr: NULL,
-	 begin_func: fdi_begin_func,
-	 camera_func: fdi_camera_func,
-	 end_func: fdi_end_func
+	{"hal-fdi",
+	 "fdi file for HAL",
+	 "Put it into /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi",
+	 NULL,
+	 fdi_begin_func,
+	 fdi_camera_func,
+	 fdi_end_func
 	},
-	{name: "hal-fdi-device",
-	 descr: "fdi device file for HAL",
-	 help: "Put it into /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi",
-	 paramdescr: NULL,
-	 begin_func: fdi_device_begin_func,
-	 camera_func: fdi_device_camera_func,
-	 end_func: fdi_device_end_func
+	{"hal-fdi-device",
+	 "fdi device file for HAL",
+	 "Put it into /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi",
+	 NULL,
+	 fdi_device_begin_func,
+	 fdi_device_camera_func,
+	 fdi_device_end_func
 	},
-	{name: "udev-rules",
-	 descr: "udev rules file either for pre-0.98 or 0.98 and later",
-	 help: "Put it into /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n"
+	{"udev-rules",
+	 "udev rules file either for pre-0.98 or 0.98 and later",
+	 "Put it into /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n"
 	 "        or add script to run. This rule files also uses the\n"
 	 "        check-ptp-camera script included in libgphoto2 source. Either put it to\n"
 	 "        /lib/udev/check-ptp-camera or adjust the path in the generated rules file.\n"
 	 "        If you give a script parameter, the mode, owner, group parameters will be ignored.",
-	 paramdescr: "[script <PATH_TO_SCRIPT>|version <version>|mode <mode>|owner <owner>|group <group>]*",
-	 begin_func: udev_begin_func, 
-	 camera_func: udev_camera_func,
-	 end_func: udev_end_func
+	 "[script <PATH_TO_SCRIPT>|version <version>|mode <mode>|owner <owner>|group <group>]*",
+	 udev_begin_func, 
+	 udev_camera_func,
+	 udev_end_func
 	},
-	{name: "idlist",
-	 descr: "list of IDs and names",
-	 help: "grep for an ID to find the device name",
-	 paramdescr: NULL,
-	 begin_func: empty_begin_func, 
-	 camera_func: idlist_camera_func,
-	 end_func: empty_end_func
+	{"idlist",
+	 "list of IDs and names",
+	 "grep for an ID to find the device name",
+	 NULL,
+	 empty_begin_func, 
+	 idlist_camera_func,
+	 empty_end_func
 	},
 #ifdef ENABLED_GP2DDB
-	{name: "gp2ddb",
-	 descr: "gphoto2 device database (PRE-ALPHA)",
-	 help: "PRE-ALPHA test stage, do not use for production! Machine parseable.",
-	 paramdescr: NULL,
-	 begin_func: ddb_begin_func,
-	 camera_func: ddb_camera_func,
-	 end_func: ddb_end_func
+	{"gp2ddb",
+	 "gphoto2 device database (PRE-ALPHA)",
+	 "PRE-ALPHA test stage, do not use for production! Machine parseable.",
+	 NULL,
+	 ddb_begin_func,
+	 ddb_camera_func,
+	 ddb_end_func
 	},
 #endif
 	{NULL, NULL, NULL, NULL, 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10188
          http://svn.sourceforge.net/gphoto/?rev=10188&view=rev
Author:   marcusmeissner
Date:     2007-05-11 11:08:09 -0700 (Fri, 11 May 2007)

Log Message:
-----------
added some free() on error returns. (CID 83)

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-05-11 17:45:19 UTC (rev 10187)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-05-11 18:08:09 UTC (rev 10188)
@@ -1038,10 +1038,19 @@
 	CameraAbilities a;
 	func_params_t params;
 	void *data = NULL;
+	int ret;
 
 	CR (gp_abilities_list_new (&al));
-	CR (gp_abilities_list_load (al, NULL)); /* use NULL context */
-	CR (number_of_cameras = gp_abilities_list_count (al));
+	ret = gp_abilities_list_load (al, NULL); /* use NULL context */
+	if (ret < GP_OK) {
+		gp_abilities_list_free (al);
+		return ret;
+	}
+	number_of_cameras = gp_abilities_list_count (al);
+	if (number_of_cameras < GP_OK) {
+		gp_abilities_list_free (al);
+		return ret;
+	}
 
 	params.add_comments = add_comments;
 	params.number_of_cameras = number_of_cameras;
@@ -1054,7 +1063,9 @@
 	if (format->camera_func != NULL) {
 		int i;
 		for (i = 0; i < number_of_cameras; i++) {
-			CR (gp_abilities_list_get_abilities (al, i, &a));
+			ret = gp_abilities_list_get_abilities (al, i, &a);
+			if (ret < GP_OK)
+				continue;
 			format->camera_func(&params, i, number_of_cameras, &a, data);
 		}
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10344
          http://svn.sourceforge.net/gphoto/?rev=10344&view=rev
Author:   marcusmeissner
Date:     2007-06-02 06:01:48 -0700 (Sat, 02 Jun 2007)

Log Message:
-----------
make 0.98 udev output the default.

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-05-31 20:51:46 UTC (rev 10343)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-06-02 13:01:48 UTC (rev 10344)
@@ -392,7 +392,7 @@
 {
 	udev_persistent_data_t *pdata;
 	pdata = calloc(1, sizeof(udev_persistent_data_t));
-	pdata->version = UDEV_PRE_0_98;
+	pdata->version = UDEV_0_98;
 	ASSERT(data != NULL);
 	*data = (void *) pdata;
 	if (1) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10525
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10525&view=rev
Author:   hun
Date:     2007-08-02 04:03:14 -0700 (Thu, 02 Aug 2007)

Log Message:
-----------
Get rid of C99isms (based on) patch by Dan Fandrich

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-08-02 10:54:02 UTC (rev 10524)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-08-02 11:03:14 UTC (rev 10525)
@@ -382,14 +382,31 @@
 	char *owner;
 	char *group;
 	char *script;
-	char *begin_string;
-	char *usbcam_string;
+	const char *begin_string;
+	const char *usbcam_string;
 } udev_persistent_data_t;
 
 
 static void
 udev_parse_params (const func_params_t *params, void **data)
 {
+	/* Note: 2 lines because we need to use || ... having them on the same
+	 * line would mean &&.
+	 */
+	static const char * const begin_strings[] = {
+		/* UDEV_PRE_0_98 */
+		"BUS!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
+		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n",
+		/* UDEV_0_98 */
+		"SUBSYSTEM!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
+		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n"
+	};
+	static const char * const usbcam_strings[] = {
+		/* UDEV_PRE_0_98 */
+		"SYSFS{idVendor}==\"%04x\", SYSFS{idProduct}==\"%04x\", ",
+		/* UDEV_0_98 */
+		"ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ",
+	};
 	udev_persistent_data_t *pdata;
 	pdata = calloc(1, sizeof(udev_persistent_data_t));
 	pdata->version = UDEV_0_98;
@@ -436,37 +453,12 @@
 		FATAL("The <script> parameter conflicts with the <mode,group,owner> parameters.");
 	}
 
-	/* Note: 2 lines because we need to use || ... having them on the same
-	 * line would mean &&.
-	 */
-	static char *begin_strings[] = {
-		/* UDEV_PRE_0_98 */
-		"BUS!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
-		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n",
-		/* UDEV_0_98 */
-		"SUBSYSTEM!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
-		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n"
-	};
-	static char *usbcam_strings[] = {
-		/* UDEV_PRE_0_98 */
-		"SYSFS{idVendor}==\"%04x\", SYSFS{idProduct}==\"%04x\", ",
-		/* UDEV_0_98 */
-		"ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ",
-	};
 	pdata->begin_string = begin_strings[pdata->version];
 	pdata->usbcam_string = usbcam_strings[pdata->version];
 }
 
-static void
-version_str_func(const char *str, void *data)
-{
-	const char **foo = (const char **)data;
-	fprintf(stdout, "V[%s]", str);
-	fflush(stdout);
-	*foo = str;
-}
 
-static inline const char *
+static const char *
 get_version_str(udev_version_t version)
 {
 	return gpi_enum_to_string(version, udev_version_t_map);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10735
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10735&view=rev
Author:   marcusmeissner
Date:     2007-09-26 06:18:40 -0700 (Wed, 26 Sep 2007)

Log Message:
-----------
SUBSYSTEM is just "usb" for newer kernels.

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-09-26 00:45:49 UTC (rev 10734)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2007-09-26 13:18:40 UTC (rev 10735)
@@ -398,7 +398,7 @@
 		"BUS!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
 		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n",
 		/* UDEV_0_98 */
-		"SUBSYSTEM!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
+		"SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
 		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n"
 	};
 	static const char * const usbcam_strings[] = {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10967
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10967&view=rev
Author:   marcusmeissner
Date:     2008-02-26 08:31:45 -0800 (Tue, 26 Feb 2008)

Log Message:
-----------
info.bus is now called info.subsystem. Will be obsoleted on March 1 2008.

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2008-02-25 12:45:32 UTC (rev 10966)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2008-02-26 16:31:45 UTC (rev 10967)
@@ -790,7 +790,7 @@
 	print_version_comment(stdout, "    | ", "\n", "<!--+\n", "    +-->\n");
 	printf("<deviceinfo version=\"0.2\">\n");
 	printf(" <device>\n");
-	printf("  <match key=\"info.bus\" string=\"usb\">\n");
+	printf("  <match key=\"info.subsystem\" string=\"usb\">\n");
 	return 0;
 }
 
@@ -909,7 +909,7 @@
 	print_version_comment(stdout, "    | ", "\n", "<!--+\n", "    +-->\n");
 	printf("<deviceinfo version=\"0.2\">\n");
 	printf(" <device>\n");
-	printf("  <match key=\"info.bus\" string=\"usb\">\n");
+	printf("  <match key=\"info.subsystem\" string=\"usb\">\n");
 	return 0;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10975
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10975&view=rev
Author:   marcusmeissner
Date:     2008-03-02 12:41:25 -0800 (Sun, 02 Mar 2008)

Log Message:
-----------
added another olympus ID 
https://sourceforge.net/tracker/index.php?func=detail&aid=1886330&group_id=8874&atid=308874

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2008-03-02 20:30:51 UTC (rev 10974)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2008-03-02 20:41:25 UTC (rev 10975)
@@ -821,7 +821,7 @@
 	*d = '\0';
 
 	if ((a->port & GP_PORT_USB)) {
-		if (a->usb_vendor == 0x07b4 && a->usb_product == 0x105) {
+		if (a->usb_vendor == 0x07b4 && (a->usb_product == 0x105 || a->usb_product == 0x109) ) {
 			/* Marcus says: The Olympus Sierra/Storage dual mode camera firmware.
 			 * Some HAL using software gets deeply confused by this being here
 			 * and also detected as mass storage elsewhere, so blacklist
@@ -941,7 +941,7 @@
 
 	if ((a->port & GP_PORT_USB)) {
 
-		if (a->usb_vendor == 0x07b4 && a->usb_product == 0x105) {
+		if (a->usb_vendor == 0x07b4 && (a->usb_product == 0x105 || a->usb_product == 0x109)) {
 			/* Marcus says: The Olympus Sierra/Storage dual mode camera firmware.
 			 * Some HAL using software gets deeply confused by this being here
 			 * and also detected as mass storage elsewhere, so blacklist


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11182
          http://gphoto.svn.sourceforge.net/gphoto/?rev=11182&view=rev
Author:   marcusmeissner
Date:     2008-06-22 22:34:42 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
do not output empty udev rules (if we have no match)

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2008-06-22 16:37:07 UTC (rev 11181)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2008-06-23 05:34:42 UTC (rev 11182)
@@ -506,6 +506,7 @@
 	int flags = 0;
 	int class = 0, subclass = 0, proto = 0;
 	int usb_vendor = 0, usb_product = 0;
+	int has_valid_rule = 0;
 	udev_persistent_data_t *pdata = (udev_persistent_data_t *) data;
 	ASSERT(pdata != NULL);
 
@@ -546,42 +547,49 @@
 	if (flags & GP_USB_HOTPLUG_MATCH_INT_CLASS) {
 		if ((flags & (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) == (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) {
 			printf("PROGRAM=\"check-ptp-camera %02d/%02d/%02d\", ", class, subclass, proto);
+			has_valid_rule = 1;
 		} else {
 			if (class == 666) {
 				printf("# not working yet: PROGRAM=\"check-mtp-device\", ");
+				has_valid_rule = 1;
 			} else {
 				fprintf(stderr, "unhandled interface match flags %x\n", flags);
 			}
 		}
 	} else {
-		if (flags & GP_USB_HOTPLUG_MATCH_VENDOR_ID)
+		if (flags & GP_USB_HOTPLUG_MATCH_VENDOR_ID) {
 			printf (pdata->usbcam_string, a->usb_vendor, a->usb_product);
-		else
+			has_valid_rule = 1;
+		} else {
 			fprintf (stderr, "Error: Trying to output device %d/%d with incorrect match flags.\n",
 				a->usb_vendor, a->usb_product
 			);
+		}
 	}
-	if (pdata->script != NULL) {
-		printf("RUN+=\"%s\"\n", pdata->script);
-	} else if (pdata->mode != NULL || pdata->owner != NULL || pdata->group != NULL) {
-		if (pdata->mode != NULL) {
-			printf("MODE=\"%s\"", pdata->mode);
-			if (pdata->owner != NULL || pdata->group != NULL) {
-				printf(", ");
+	if (has_valid_rule != 0) {
+		if (pdata->script != NULL) {
+			printf("RUN+=\"%s\"\n", pdata->script);
+		} else if (pdata->mode != NULL || pdata->owner != NULL || pdata->group != NULL) {
+			if (pdata->mode != NULL) {
+				printf("MODE=\"%s\"", pdata->mode);
+				if (pdata->owner != NULL || pdata->group != NULL) {
+					printf(", ");
+				}
 			}
-		}
-		if (pdata->owner != NULL) {
-			printf("OWNER=\"%s\"", pdata->owner);
+			if (pdata->owner != NULL) {
+				printf("OWNER=\"%s\"", pdata->owner);
+				if (pdata->group != NULL) {
+					printf(", ");
+				}
+			}
 			if (pdata->group != NULL) {
-				printf(", ");
+				printf("GROUP=\"%s\"", pdata->group);
 			}
+			printf("\n");
+		} else {
+			printf("\n");
+			FATAL("udev_camera_func(): illegal branch");
 		}
-		if (pdata->group != NULL) {
-			printf("GROUP=\"%s\"", pdata->group);
-		}
-		printf("\n");
-	} else {
-		FATAL("udev_camera_func(): illegal branch");
 	}
 	return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.