--- sourceforge.net/trunk/rdesktop/disk.c	2004/05/06 08:17:14	690
+++ sourceforge.net/trunk/rdesktop/disk.c	2004/08/25 09:48:11	758
@@ -20,16 +20,6 @@
 
 #include "disk.h"
 
-#if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
-#define SOLARIS
-#endif
-
-#if (defined(SOLARIS) || defined(__hpux))
-#define DIRFD(a) ((a)->dd_fd)
-#else
-#define DIRFD(a) (dirfd(a))
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -41,6 +31,16 @@
 #include <utime.h>
 #include <time.h>		/* ctime */
 
+#if (defined(HAVE_DIRFD) || defined(HAVE_DECL_DIRFD))
+#define DIRFD(a) (dirfd(a))
+#else
+#define DIRFD(a) ((a)->DIR_FD_MEMBER_NAME)
+#endif
+
+/* TODO: let autoconf figure out everything below... */
+#if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+#define SOLARIS
+#endif
 
 #if (defined(SOLARIS) || defined (__hpux) || defined(__BEOS__))
 #include <sys/statvfs.h>	/* solaris statvfs */
@@ -59,6 +59,13 @@
 #define STATFS_T statfs
 #define F_NAMELEN(buf) (NAME_MAX)
 
+#elif (defined(__SGI_IRIX__))
+#include <sys/types.h>
+#include <sys/statvfs.h>
+#define STATFS_FN(path, buf) (statvfs(path,buf))
+#define STATFS_T statvfs
+#define F_NAMELEN(buf) ((buf).f_namemax)
+
 #else
 #include <sys/vfs.h>		/* linux statfs */
 #include <mntent.h>
@@ -142,16 +149,14 @@
 	while ((pos = next_arg(optarg, ',')) && *id < RDPDR_MAX_DEVICES)
 	{
 		pos2 = next_arg(optarg, '=');
-		strcpy(g_rdpdr_device[*id].name, optarg);
-
-		toupper_str(g_rdpdr_device[*id].name);
 
-		/* add trailing colon to name. */
-		strcat(g_rdpdr_device[*id].name, ":");
+		strncpy(g_rdpdr_device[*id].name, optarg, sizeof(g_rdpdr_device[*id].name));
+		if (strlen(optarg) > 8)
+			fprintf(stderr, "share name %s truncated to %s\n", optarg,
+				g_rdpdr_device[*id].name);
 
 		g_rdpdr_device[*id].local_path = xmalloc(strlen(pos2) + 1);
 		strcpy(g_rdpdr_device[*id].local_path, pos2);
-		printf("DISK %s to %s\n", g_rdpdr_device[*id].name, g_rdpdr_device[*id].local_path);
 		g_rdpdr_device[*id].device_type = DEVICE_TYPE_DISK;
 		count++;
 		(*id)++;
@@ -820,7 +825,7 @@
 
 	switch (info_class)
 	{
-		case 3:	//FIXME: Why 3?
+		case FileBothDirectoryInformation:
 
 			// If a search pattern is received, remember this pattern, and restart search
 			if (pattern[0] != 0)
@@ -840,13 +845,23 @@
 			// Get information for directory entry
 			sprintf(fullpath, "%s/%s", dirname, pdirent->d_name);
 
-			/* JIF
-			   printf("Stat: %s\n", fullpath); */
 			if (stat(fullpath, &fstat))
 			{
-				perror("stat");
-				out_uint8(out, 0);
-				return STATUS_ACCESS_DENIED;
+				switch (errno)
+				{
+					case ENOENT:
+					case ELOOP:
+					case EACCES:
+						/* These are non-fatal errors. */
+						memset(&fstat, 0, sizeof(fstat));
+						break;
+					default:
+						/* Fatal error. By returning STATUS_NO_SUCH_FILE, 
+						   the directory list operation will be aborted */
+						perror(fullpath);
+						out_uint8(out, 0);
+						return STATUS_NO_SUCH_FILE;
+				}
 			}
 
 			if (S_ISDIR(fstat.st_mode))
@@ -890,6 +905,9 @@
 			break;
 
 		default:
+			/* FIXME: Support FileDirectoryInformation,
+			   FileFullDirectoryInformation, and
+			   FileNamesInformation */
 
 			unimpl("IRP Query Directory sub: 0x%x\n", info_class);
 			return STATUS_INVALID_PARAMETER;