Better printer detection

Author: Gustaf Haglund

Makefile

@@ -18,20 +18,21 @@
 ##	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-DEBUG = -g3 -ggdb -fvar-tracking -fvar-tracking-assignments
-CC = gcc -Wall -pedantic -std=gnu99 #$(DEBUG)
-LIBS = $(shell pkg-config --cflags --libs libusb-1.0) -ljbig -lcups
+DEBUG = -D_DEBUG -g3 -ggdb -fvar-tracking
+CC = gcc -Wall -pedantic -std=gnu99 -I/usr/local/include $(DEBUG)
+LIBS = $(shell pkg-config --cflags libusb-1.0)
+FINAL_LIBS=$(shell pkg-config --libs libusb-1.0) -ljbig -lcups
 
 BIN = bin/gurich
 BIN_CBACKEND = bin/gurich_cbackend
 
-CFLAGS = -Isrc $(LIBS) -D_DEBUG #-D_NO_PRINT_USB
+CFLAGS = -Isrc $(LIBS) #-D_DEBUG -D_NO_PRINT_USB
 
 CBACKEND_DEPEND = src/prntother.o src/basic.o src/prntcommon.o
 
 all: $(patsubst src/%.c, src/%.o,$(wildcard src/*.c)) $(patsubst src/cbackend/%.c, src/cbackend/%.o,$(wildcard src/cbackend/*.c))
-	$(CC) $(CFLAGS) -o $(BIN) src/*.o  $(LIBS)
-	$(CC) $(CFLAGS) -o $(BIN_CBACKEND) $(CBACKEND_DEPEND) src/cbackend/*.o $(LIBS)
+	$(CC) $(CFLAGS) -o $(BIN) src/*.o  $(FINAL_LIBS)
+	$(CC) $(CFLAGS) -o $(BIN_CBACKEND) $(CBACKEND_DEPEND) src/cbackend/*.o $(FINAL_LIBS)
 
 dev:
 	rm src/*.o

readme

@@ -2,11 +2,11 @@ Gurich is a free printer driver for Ricoh SP112.
 Other printers in the Ricoh SP100/Ricoh SP110 series probably work too.
 
 In order to install this driver, please see the INSTALL file.
-Contributions to this project is welcome, but please follow the code style used in this driver.
+Contributions to this project are welcome, but please follow the code style used in this driver.
 
 If you want a driver with warranty, then use Ricoh's driver for Microsoft Windows.
 
-I am not affilated with or employed by Ricoh, this project is done in my spare time.
+I am not affilated with nor employed by Ricoh, this project is done in my spare time.
 All trademarks mentioned in this project are owned by their respective owner.
 
 == Features ==
@@ -29,7 +29,7 @@ For other use cases, e.g seeing how much toner is left:
 $ ./bin/gurich -s
 [...]
 Printer status: GOOD / ENERGY SAVING MODE 2 / IDLE, reference: 0x31
-Printer toner: 80 % left 
+Printer toner: 80 % left
 Printed out pages (stats): 301
 
 $ ./bin/gurich -h
@@ -38,7 +38,8 @@ print: ./bin/gurich -p [ps/pdf file, resolution (600|1200), copies, paper type (
 status: ./bin/gurich -s
 testpage: ./bin/gurich -t
 
-You might need to make a rule for udev in order to avoid running gurich with root privileges.
+You might need to make a rule for udev in order to avoid running gurich with root privileges,
+on GNU/Linux-based systems.
 
 == Thanks to ==
 Serge V Shistarev for the PPD file,

src/basic.c

@@ -12,7 +12,7 @@
 
 	This program 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
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
@@ -22,29 +22,30 @@
 
 #include <gurich.h>
 
-void check_printer_usb(struct gurich_usb * g)
+void printer_usb(struct gurich_usb * g, uint64_t idProduct)
 {
 	char libusb_strerror[128];
 	int libusb_error;
 
-	libusb_init(&g->ctx);
 	libusb_set_debug(g->ctx, PRINTER_LIBUSB_DEBUG);
 
-	g->device_handle = libusb_open_device_with_vid_pid(g->ctx, PRINTER_VENDOR_ID, PRINTER_DEVICE_ID);
+	g->device_handle = libusb_open_device_with_vid_pid(g->ctx, PRINTER_VENDOR_ID, idProduct);
 
 	if (g->device_handle == NULL)
 	{
 		libusb_close(g->device_handle);
 		libusb_exit(g->ctx);
-		printf("Could not find the printer. Quitting.\n\n");
+		fprintf(stderr, "Something did happen with the printer. Quitting.\n\n");
 		exit(-1);
 	}
 
 	g->device = libusb_get_device(g->device_handle);
-	libusb_error = libusb_detach_kernel_driver(g->device_handle, 0);
 
-	if (libusb_error != 0) {
-		goto libusb_fail;
+	libusb_error = libusb_kernel_driver_active(g->device_handle, 0);
+	if (libusb_error == 1) {
+		if ((libusb_error = libusb_detach_kernel_driver(g->device_handle, 0)) < 0) {
+			goto libusb_fail;
+		}
 	}
 
 	libusb_error = libusb_claim_interface(g->device_handle, 0);
@@ -68,6 +69,37 @@ void check_printer_usb(struct gurich_usb * g)
 		exit(-1);
 }
 
+void check_printer_usb(struct gurich_usb * g)
+{
+	libusb_device **list;
+	struct libusb_device_descriptor devdesc;
+	ssize_t numusbdevs, i, err;
+
+	err = libusb_init(&g->ctx);
+	numusbdevs = libusb_get_device_list(g->ctx, &list);
+
+	for (i = 0; i < numusbdevs; ++i)
+	{
+		g->device = list[i];
+
+		if (libusb_get_device_descriptor(g->device, &devdesc) < 0)
+			continue;
+
+		if (!devdesc.bNumConfigurations || !devdesc.idVendor
+			|| !devdesc.idProduct)
+			continue;
+
+		if (devdesc.idVendor == PRINTER_VENDOR_ID) {
+			/* Found a Ricoh printer. */
+			printer_usb(g, devdesc.idProduct);
+		}
+	}
+
+	if (numusbdevs >= 0) {
+		libusb_free_device_list(list, 1);
+	}
+}
+
 void cleanup_usb(struct gurich_usb * g)
 {
 	if (g->initialized)

src/cbackend/cbackend.c

@@ -12,7 +12,7 @@
 
 	This program 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
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
@@ -26,8 +26,8 @@
 
 static void tell_cups()
 {
-	printf("gurich://RICOH/SP 112 DDST?serial=X025M233243\n");
-	/* TODO: Tell cups correctly */
+	printf("direct gurich://RICOH/SP 112 DDST?serial=X025M233243\n");
+	/* TODO: A better way, this will not work currently */
 }
 
 int main(int argc, char ** argv)
@@ -48,7 +48,7 @@ int main(int argc, char ** argv)
 		return 0;
 	}
 
-	char binbuf[4096];
+	char binbuf[8192];
 	size_t readlen;
 	int fp = 0;
 

src/gurich.c

@@ -12,7 +12,7 @@
 
 	This program 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
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
@@ -171,6 +171,11 @@ int main(int argc, char ** argv)
 		init_msg();
 		check_printer_usb(&g);
 
+		if (!g.initialized) {
+			fprintf(stderr, "Could not find the printer. Quitting.\n\n");
+			exit(-1);
+		}
+
 		switch(arg[1])
 		{
 			case 'p':

src/gurich.h

@@ -1,7 +1,7 @@
 /*
 
 				Gurich
-	**	Ricoh SP110 series driver **
+		**	Ricoh SP110 series driver **
 
 	Copyright (C) 2016, 2017 Gustaf Haglund <[email protected]>
 
@@ -12,7 +12,7 @@
 
 	This program 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
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
@@ -48,7 +48,12 @@
 #endif
 
 #ifndef GURICH_TEMP_DIR_PERMISSION
-	#define GURICH_TEMP_DIR_PERMISSION 0644
+	#define GURICH_TEMP_DIR_PERMISSION 0666
+#endif
+
+#ifndef _D_EXACT_NAMLEN
+	/* For BSD systems. */
+	#define _D_EXACT_NAMLEN(d) strlen((d)->d_name)
 #endif
 
 struct gurich_usb {
@@ -116,7 +121,7 @@ void gurich_jbg(FILE *pbmFp,
 	struct gurich_pbm * pbm,
 	struct gurich_jbg_st *jbg);
 
-/* Printer communication functions */
+/* "Real" printer functions */
 struct gurich_status gurich_status(struct gurich_usb * g);
 unsigned short int gurich_toner(struct gurich_usb * g);
 size_t gurich_printed(struct gurich_usb * g);

src/prnt.c

@@ -12,7 +12,7 @@
 
 	This program 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
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License

src/prnt.h

@@ -12,7 +12,7 @@
 
 	This program 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
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
@@ -26,7 +26,6 @@
 #define __GURICH_PRINT__H
 
 #define PRINTER_VENDOR_ID         0x05ca
-#define PRINTER_DEVICE_ID         0x0447
 #define PRINTER_LIBUSB_DEBUG      3
 
 #define PRINTER_STANDARD_MEDIATYPE		"PLAINRECYCLE"
@@ -35,11 +34,10 @@
 #define PRINTER_STANDARD_HOLD			"OFF"
 #define PRINTER_STANDARD_RESOLUTION		"600"
 
-#define PRINTER_START			0x1b, 0x25, 0x2d, 0x31, 0x32, 0x33, 0x34, 0x35, 0x58, 0x40, 0x50, 0x4a, 0x4c, 0x0d, 0x0a
-#define PRINTER_START_FORMAT	"%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c"
-#define PRINTER_PAGE_END		"@PJL SET PAGESTATUS=END\r\n"
-#define PRINTER_END				"@PJL EOJ\r\n%-12345X\r\n"
-#define PRINTER_END_FORMAT		"%s"
+#define PRINTER_START	0x1b, 0x25, 0x2d, 0x31, 0x32, 0x33, 0x34, 0x35, 0x58, 0x40, 0x50, 0x4a, 0x4c, 0x0d, 0x0a
+#define PRINTER_START_FORMAT "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c"
+#define PRINTER_PAGE_END "@PJL SET PAGESTATUS=END\r\n"
+#define PRINTER_END	"@PJL EOJ\r\n%-12345X\r\n"
 
 #define PRINTER_PBM_DIR "temp/pbm/"
 #define PRINTER_PBM_DIRLEN 9

src/prntcommon.h

@@ -12,7 +12,7 @@
 
 	This program 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
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License

src/prntother.c

@@ -12,7 +12,7 @@
 
 	This program 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
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License

src/shworkaround.c

@@ -12,7 +12,7 @@
 
 	This program 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
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License