--- src/bin/cpdup/cpdup.c	2006/09/16 16:47:29	1.17
+++ src/bin/cpdup/cpdup.c	2006/09/21 04:09:28	1.18
@@ -109,6 +109,7 @@ int DoCopy(const char *spath, const char
 int AskConfirmation = 1;
 int SafetyOpt = 1;
 int ForceOpt;
+int DeviceOpt = 1;
 int VerboseOpt;
 int QuietOpt;
 int NoRemoveOpt;
@@ -201,6 +202,9 @@ main(int ac, char **av)
 	case 'i':
 	    AskConfirmation = v;
 	    break;
+	case 'j':
+	    DeviceOpt = v;
+	    break;
 	case 's':
 	    SafetyOpt = v;
 	    break;
@@ -1012,7 +1016,7 @@ skip_copy:
 	    r = 1;
 	    logerr("%-32s softlink-failed\n", (dpath ? dpath : spath));
 	}
-    } else if (S_ISCHR(st1.st_mode) || S_ISBLK(st1.st_mode)) {
+    } else if ((S_ISCHR(st1.st_mode) || S_ISBLK(st1.st_mode)) && DeviceOpt) {
 	char path[2048];
 
 	if (ForceOpt ||