--- sourceforge.net/trunk/rdesktop/parallel.c	2004/02/15 21:19:28	608
+++ sourceforge.net/trunk/rdesktop/parallel.c	2004/10/02 01:30:33	776
@@ -7,11 +7,19 @@
 #include "rdesktop.h"
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+
+#if defined(__linux__)
+#include <linux/lp.h>
+#endif
+
+extern int errno;
 
 extern RDPDR_DEVICE g_rdpdr_device[];
 
-PARALLEL_DEVICE *
-get_parallel_data(HANDLE handle)
+static PARALLEL_DEVICE *
+get_parallel_data(NTHANDLE handle)
 {
 	int index;
 
@@ -55,6 +63,7 @@
 		// set device type
 		g_rdpdr_device[*id].device_type = DEVICE_TYPE_PARALLEL;
 		g_rdpdr_device[*id].pdevice_data = (void *) ppar_info;
+		g_rdpdr_device[*id].handle = 0;
 		count++;
 		(*id)++;
 
@@ -65,7 +74,7 @@
 
 static NTSTATUS
 parallel_create(uint32 device_id, uint32 access, uint32 share_mode, uint32 disposition,
-		uint32 flags, char *filename, HANDLE * handle)
+		uint32 flags, char *filename, NTHANDLE * handle)
 {
 	int parallel_fd;
 
@@ -76,41 +85,75 @@
 		return STATUS_ACCESS_DENIED;
 	}
 
+	/* all read and writes should be non blocking */
+	if (fcntl(parallel_fd, F_SETFL, O_NONBLOCK) == -1)
+		perror("fcntl");
+
+#if defined(LPABORT)
+	/* Retry on errors */
+	ioctl(parallel_fd, LPABORT, (int) 1);
+#endif
+
 	g_rdpdr_device[device_id].handle = parallel_fd;
 
 	*handle = parallel_fd;
 
-	/* all read and writes should be non blocking */
-	if (fcntl(*handle, F_SETFL, O_NONBLOCK) == -1)
-		perror("fcntl");
-
 	return STATUS_SUCCESS;
 }
 
 static NTSTATUS
-parallel_close(HANDLE handle)
+parallel_close(NTHANDLE handle)
 {
-	g_rdpdr_device[get_device_index(handle)].handle = 0;
+	int i = get_device_index(handle);
+	if (i >= 0)
+		g_rdpdr_device[i].handle = 0;
 	close(handle);
 	return STATUS_SUCCESS;
 }
 
-NTSTATUS
-parallel_read(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
+static NTSTATUS
+parallel_read(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
 {
 	*result = read(handle, data, length);
 	return STATUS_SUCCESS;
 }
 
 static NTSTATUS
-parallel_write(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
+parallel_write(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
 {
-	*result = write(handle, data, length);
-	return STATUS_SUCCESS;
+	int rc = STATUS_SUCCESS;
+
+	int n = write(handle, data, length);
+	if (n < 0)
+	{
+		int status;
+
+		*result = 0;
+		switch (errno)
+		{
+			case EAGAIN:
+				rc = STATUS_DEVICE_OFF_LINE;
+			case ENOSPC:
+				rc = STATUS_DEVICE_PAPER_EMPTY;
+			case EIO:
+				rc = STATUS_DEVICE_OFF_LINE;
+			default:
+				rc = STATUS_DEVICE_POWERED_OFF;
+		}
+#if defined(LPGETSTATUS)
+		if (ioctl(handle, LPGETSTATUS, &status) == 0)
+		{
+			/* coming soon: take care for the printer status */
+			printf("parallel_write: status = %d, errno = %d\n", status, errno);
+		}
+#endif
+	}
+	*result = n;
+	return rc;
 }
 
 static NTSTATUS
-parallel_device_control(HANDLE handle, uint32 request, STREAM in, STREAM out)
+parallel_device_control(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
 {
 	if ((request >> 16) != FILE_DEVICE_PARALLEL)
 		return STATUS_INVALID_PARAMETER;