Tue Nov  5 00:35:28 CET 2013  Gian Piero Carrubba <address@hidden>
  * DRAFT
diff -rN -u old-dereference-R/src/copy.h new-dereference-R/src/copy.h
--- old-dereference-R/src/copy.h	2013-11-05 00:35:44.062894654 +0100
+++ new-dereference-R/src/copy.h	2013-11-05 00:35:44.066894686 +0100
@@ -68,10 +68,8 @@
 /* How to handle symbolic links.  */
 enum Dereference_symlink
 {
-  DEREF_UNDEFINED = 1,
-
   /* Copy the symbolic link itself.  -P  */
-  DEREF_NEVER,
+  DEREF_NEVER = 1,
 
   /* If the symbolic is a command line argument, then copy
      its referent.  Otherwise, copy the symbolic link itself.  -H  */
diff -rN -u old-dereference-R/src/cp.c new-dereference-R/src/cp.c
--- old-dereference-R/src/cp.c	2013-11-05 00:35:44.062894654 +0100
+++ new-dereference-R/src/cp.c	2013-11-05 00:35:44.066894686 +0100
@@ -768,7 +768,7 @@
 {
   cp_options_default (x);
   x->copy_as_regular = true;
-  x->dereference = DEREF_UNDEFINED;
+  x->dereference = DEREF_COMMAND_LINE_ARGUMENTS;
   x->unlink_dest_before_opening = false;
   x->unlink_dest_after_failed_open = false;
   x->hard_link = false;
@@ -1133,15 +1133,6 @@
                                    version_control_string)
                    : no_backups);
 
-  if (x.dereference == DEREF_UNDEFINED)
-    {
-      if (x.recursive)
-        /* This is compatible with FreeBSD.  */
-        x.dereference = DEREF_NEVER;
-      else
-        x.dereference = DEREF_ALWAYS;
-    }
-
   if (x.recursive)
     x.copy_as_regular = copy_contents;