Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3825 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/backend/usb.c b/backend/usb.c
index 7fb3c9e3aec0e35bae994314aff490761768360c..d4b53b9e63aacdc46d99b75cede03e42b74f7f02 100644 (file)
--- a/backend/usb.c
+++ b/backend/usb.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb.c,v 1.18.2.25 2003/07/06 20:20:29 mike Exp $"
+ * "$Id: usb.c,v 1.18.2.26 2003/07/22 18:23:11 mike Exp $"
  *
  *   USB port backend for the Common UNIX Printing System (CUPS).
  *
@@ -505,7 +505,7 @@ list_devices(void)
         if (length > (sizeof(device_id) - 2))
          length = sizeof(device_id) - 2;
 
-       memcpy(device_id, device_id + 2, length);
+       memmove(device_id, device_id + 2, length);
        device_id[length] = '\0';
       }
       else
@@ -664,7 +664,7 @@ open_device(const char *uri)                /* I - Device URI */
        {
          length = (((unsigned)device_id[0] & 255) << 8) +
                   ((unsigned)device_id[1] & 255);
-         memcpy(device_id, device_id + 2, length);
+         memmove(device_id, device_id + 2, length);
          device_id[length] = '\0';
        }
        else
@@ -791,5 +791,5 @@ open_device(const char *uri)                /* I - Device URI */
 
 
 /*
- * End of "$Id: usb.c,v 1.18.2.25 2003/07/06 20:20:29 mike Exp $".
+ * End of "$Id: usb.c,v 1.18.2.26 2003/07/22 18:23:11 mike Exp $".
  */

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 7875f345d190d799f5b6176dcedf90fbd9814233..7f5f595bbd0b84cba595cedceed24f4cacfd49e0 100755 (executable)
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: run-stp-tests.sh,v 1.4.2.15 2003/07/20 12:51:55 mike Exp $"
+# "$Id: run-stp-tests.sh,v 1.4.2.16 2003/07/22 18:23:11 mike Exp $"
 #
 #   Perform the complete set of IPP compliance tests specified in the
 #   CUPS Software Test Plan.
@@ -456,6 +456,10 @@ else
        echo "All tests were successful."
 fi
 
+if test "x$valgrind" != x; then
+       echo "Valgrind lof files can be found in /tmp/$user/log."
+fi
+
 echo ""
 echo "See the following files for details:"
 echo ""
@@ -464,5 +468,5 @@ echo "    $pdffile"
 echo ""
 
 #
-# End of "$Id: run-stp-tests.sh,v 1.4.2.15 2003/07/20 12:51:55 mike Exp $"
+# End of "$Id: run-stp-tests.sh,v 1.4.2.16 2003/07/22 18:23:11 mike Exp $"
 #