From c3ce68cee2dbe2d08fc93b9c74da3dbdc0970c53 Mon Sep 17 00:00:00 2001
From: Timothy Stack <stack@flux.utah.edu>
Date: Tue, 10 May 2005 14:49:41 +0000
Subject: [PATCH] copyrights
---
robots/emc/test_emcd.sh.in | 6 ++++
robots/mtp/listNode.c | 9 ++----
robots/mtp/listNode.h | 9 ++----
robots/mtp/mtp_test.c | 5 ++++
robots/primotion/Makefile | 6 ++++
robots/primotion/circle.cc | 6 ++++
robots/primotion/commotion.cc | 6 ++++
robots/primotion/dgrobot/commotion.h | 6 ++++
robots/primotion/dgrobot/cubicpath.h | 6 ++++
robots/primotion/dgrobot/gbehaviors.cc | 6 ++++
robots/primotion/dgrobot/gbehaviors.h | 6 ++++
robots/primotion/dgrobot/gcallbacks.cc | 6 ++++
robots/primotion/dgrobot/gcallbacks.h | 6 ++++
robots/primotion/dgrobot/grobot.cc | 6 ++++
robots/primotion/dgrobot/grobot.h | 6 ++++
robots/primotion/dgrobot/grobot_sim.cc | 5 ++++
robots/primotion/dgrobot/simplepath.cc | 6 ++++
robots/primotion/dgrobot/simplepath.h | 6 ++++
robots/primotion/flash-user-led.cc | 5 ++++
robots/primotion/garcia-pilot.hh | 5 ++++
robots/primotion/gorobot.cc | 6 ++++
robots/primotion/gorobotc.cc | 6 ++++
robots/primotion/pathmotion.cc | 6 ++++
robots/primotion/watch-user-button.cc | 5 ++++
robots/rmcd/test_rmcd.sh.in | 6 ++++
robots/tbsetdest/tbsetdest.cc | 6 +++-
robots/tbsetdest/tbsetdest.h | 41 ++++++++++++++++++++++++++
robots/vmcd/cam-sim.awk | 7 +++++
robots/vmcd/test_vmc-client.sh.in | 6 ++++
robots/vmcd/test_vmcd.sh.in | 6 ++++
robots/vmcd/test_vmcd2.sh | 6 ++++
robots/vmcd/test_vmcd3.sh | 6 ++++
robots/vmcd/test_vmcd4.sh | 6 ++++
33 files changed, 220 insertions(+), 15 deletions(-)
diff --git a/robots/emc/test_emcd.sh.in b/robots/emc/test_emcd.sh.in
index 6de734a8db..74d0e4ca73 100644
--- a/robots/emc/test_emcd.sh.in
+++ b/robots/emc/test_emcd.sh.in
@@ -1,5 +1,11 @@
#! /bin/sh
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
## Variables
# The full path of the test case
diff --git a/robots/mtp/listNode.c b/robots/mtp/listNode.c
index 4c66173db8..b1b864cd13 100644
--- a/robots/mtp/listNode.c
+++ b/robots/mtp/listNode.c
@@ -1,12 +1,7 @@
/*
- * listNode.c
- *
- * Copyright (c) 2003, 2004, 2005 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
* All rights reserved.
- *
- * This file is licensed under the terms of the GNU Public License.
- * See the file "license.terms" for restrictions on redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
/**
diff --git a/robots/mtp/listNode.h b/robots/mtp/listNode.h
index e77b94dd61..eb51364155 100644
--- a/robots/mtp/listNode.h
+++ b/robots/mtp/listNode.h
@@ -1,12 +1,7 @@
/*
- * listNode.h
- *
- * Copyright (c) 2003, 2004, 2005 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
* All rights reserved.
- *
- * This file is licensed under the terms of the GNU Public License.
- * See the file "license.terms" for restrictions on redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
/**
diff --git a/robots/mtp/mtp_test.c b/robots/mtp/mtp_test.c
index 5da90325f1..ff51afb071 100644
--- a/robots/mtp/mtp_test.c
+++ b/robots/mtp/mtp_test.c
@@ -1,3 +1,8 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
#include "config.h"
diff --git a/robots/primotion/Makefile b/robots/primotion/Makefile
index 4ff2a29282..58d4d37de9 100755
--- a/robots/primotion/Makefile
+++ b/robots/primotion/Makefile
@@ -1,3 +1,9 @@
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
# Makefile for Garcia robot applications
#
# Dan Flickinger
diff --git a/robots/primotion/circle.cc b/robots/primotion/circle.cc
index 0010226755..1065734295 100755
--- a/robots/primotion/circle.cc
+++ b/robots/primotion/circle.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* circle: garcia robot simple circle path
* (Tests grobot::setvPath(float, float))
*
diff --git a/robots/primotion/commotion.cc b/robots/primotion/commotion.cc
index bb7519238e..201569cfa1 100755
--- a/robots/primotion/commotion.cc
+++ b/robots/primotion/commotion.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* Garcia robot motion program (command and interactive mode)
*
* Dan Flickinger
diff --git a/robots/primotion/dgrobot/commotion.h b/robots/primotion/dgrobot/commotion.h
index 107d5490b6..bf0fa88d70 100755
--- a/robots/primotion/dgrobot/commotion.h
+++ b/robots/primotion/dgrobot/commotion.h
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* Garcia motion program (command and interactive mode)
*
* Dan Flickinger
diff --git a/robots/primotion/dgrobot/cubicpath.h b/robots/primotion/dgrobot/cubicpath.h
index f1860d8f5b..ad4d98666b 100755
--- a/robots/primotion/dgrobot/cubicpath.h
+++ b/robots/primotion/dgrobot/cubicpath.h
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* cubicpath.h
*
* class with methods for generating cubic paths
diff --git a/robots/primotion/dgrobot/gbehaviors.cc b/robots/primotion/dgrobot/gbehaviors.cc
index 7f44181369..53e8cac382 100644
--- a/robots/primotion/dgrobot/gbehaviors.cc
+++ b/robots/primotion/dgrobot/gbehaviors.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* Garcia robot behavior class methods
*
* Dan Flickinger
diff --git a/robots/primotion/dgrobot/gbehaviors.h b/robots/primotion/dgrobot/gbehaviors.h
index babd5bb351..4c203f00ed 100644
--- a/robots/primotion/dgrobot/gbehaviors.h
+++ b/robots/primotion/dgrobot/gbehaviors.h
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* Garcia robot behavior data class
*
* Dan Flickinger
diff --git a/robots/primotion/dgrobot/gcallbacks.cc b/robots/primotion/dgrobot/gcallbacks.cc
index 474ab53d03..ddd8d3457d 100755
--- a/robots/primotion/dgrobot/gcallbacks.cc
+++ b/robots/primotion/dgrobot/gcallbacks.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* Garcia robot callback class methods
*
* Dan Flickinger
diff --git a/robots/primotion/dgrobot/gcallbacks.h b/robots/primotion/dgrobot/gcallbacks.h
index b2a8e4ec3c..8589e9cfe8 100755
--- a/robots/primotion/dgrobot/gcallbacks.h
+++ b/robots/primotion/dgrobot/gcallbacks.h
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* Callback functions for garcia robot
*
* Dan Flickinger
diff --git a/robots/primotion/dgrobot/grobot.cc b/robots/primotion/dgrobot/grobot.cc
index 7657921a01..847a6e6ec3 100755
--- a/robots/primotion/dgrobot/grobot.cc
+++ b/robots/primotion/dgrobot/grobot.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* Garcia robot class methods
*
* Dan Flickinger
diff --git a/robots/primotion/dgrobot/grobot.h b/robots/primotion/dgrobot/grobot.h
index a65da394be..a02f9f430c 100755
--- a/robots/primotion/dgrobot/grobot.h
+++ b/robots/primotion/dgrobot/grobot.h
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* Garcia robot class
*
* Dan Flickinger
diff --git a/robots/primotion/dgrobot/grobot_sim.cc b/robots/primotion/dgrobot/grobot_sim.cc
index b9ae55735c..67d2f50d4f 100644
--- a/robots/primotion/dgrobot/grobot_sim.cc
+++ b/robots/primotion/dgrobot/grobot_sim.cc
@@ -1,3 +1,8 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
#include "config.h"
diff --git a/robots/primotion/dgrobot/simplepath.cc b/robots/primotion/dgrobot/simplepath.cc
index bec6c47b1e..4a2ba198d5 100755
--- a/robots/primotion/dgrobot/simplepath.cc
+++ b/robots/primotion/dgrobot/simplepath.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* simplepath.cc
* methods for spathseg class; simple path segment generator
*
diff --git a/robots/primotion/dgrobot/simplepath.h b/robots/primotion/dgrobot/simplepath.h
index cb545db2dc..aabb08921f 100755
--- a/robots/primotion/dgrobot/simplepath.h
+++ b/robots/primotion/dgrobot/simplepath.h
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* simplepath.h
* class with methods for generating simple paths
*
diff --git a/robots/primotion/flash-user-led.cc b/robots/primotion/flash-user-led.cc
index d4a8a392eb..dbd2441987 100644
--- a/robots/primotion/flash-user-led.cc
+++ b/robots/primotion/flash-user-led.cc
@@ -1,3 +1,8 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
#include "config.h"
diff --git a/robots/primotion/garcia-pilot.hh b/robots/primotion/garcia-pilot.hh
index 20cf74d1e4..2b85d5ec39 100644
--- a/robots/primotion/garcia-pilot.hh
+++ b/robots/primotion/garcia-pilot.hh
@@ -1,3 +1,8 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
#ifndef _garcia_pilot_hh
#define _garcia_pilot_hh
diff --git a/robots/primotion/gorobot.cc b/robots/primotion/gorobot.cc
index 2a7908faf2..0ed11535ca 100755
--- a/robots/primotion/gorobot.cc
+++ b/robots/primotion/gorobot.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* gorobot.cc
*
* Sends the robot to points via the
diff --git a/robots/primotion/gorobotc.cc b/robots/primotion/gorobotc.cc
index cc12418aa2..6d176977c4 100644
--- a/robots/primotion/gorobotc.cc
+++ b/robots/primotion/gorobotc.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* gorobotc.cc
*
* Console application to drive robot using grobot::goto()
diff --git a/robots/primotion/pathmotion.cc b/robots/primotion/pathmotion.cc
index b43ef02f79..c9c77179b9 100755
--- a/robots/primotion/pathmotion.cc
+++ b/robots/primotion/pathmotion.cc
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
/* pathmotion: garcia robot path generator
*
* Dan Flickinger
diff --git a/robots/primotion/watch-user-button.cc b/robots/primotion/watch-user-button.cc
index abf869a08d..f5c8ab2994 100644
--- a/robots/primotion/watch-user-button.cc
+++ b/robots/primotion/watch-user-button.cc
@@ -1,3 +1,8 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
#include "config.h"
diff --git a/robots/rmcd/test_rmcd.sh.in b/robots/rmcd/test_rmcd.sh.in
index 8989faca8a..7ac042817a 100644
--- a/robots/rmcd/test_rmcd.sh.in
+++ b/robots/rmcd/test_rmcd.sh.in
@@ -1,5 +1,11 @@
#! /bin/sh
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
## Variables
# The full path of the test case
diff --git a/robots/tbsetdest/tbsetdest.cc b/robots/tbsetdest/tbsetdest.cc
index 238e27061a..adf2a52a36 100644
--- a/robots/tbsetdest/tbsetdest.cc
+++ b/robots/tbsetdest/tbsetdest.cc
@@ -35,7 +35,11 @@
*
*/
-
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
extern "C" {
#include <pwd.h>
diff --git a/robots/tbsetdest/tbsetdest.h b/robots/tbsetdest/tbsetdest.h
index bd5343d0af..d9dac763aa 100644
--- a/robots/tbsetdest/tbsetdest.h
+++ b/robots/tbsetdest/tbsetdest.h
@@ -1,4 +1,45 @@
+/*
+ * Copyright (c) 1997, 1998, 2005 Carnegie Mellon University. All Rights
+ * Reserved.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation is hereby granted (including for
+ * commercial or for-profit use), provided that both the copyright notice
+ * and this permission notice appear in all copies of the software,
+ * derivative works, or modified versions, and any portions thereof, and
+ * that both notices appear in supporting documentation, and that credit
+ * is given to Carnegie Mellon University in all publications reporting
+ * on direct or indirect use of this code or its derivatives.
+ *
+ * ALL CODE, SOFTWARE, PROTOCOLS, AND ARCHITECTURES DEVELOPED BY THE CMU
+ * MONARCH PROJECT ARE EXPERIMENTAL AND ARE KNOWN TO HAVE BUGS, SOME OF
+ * WHICH MAY HAVE SERIOUS CONSEQUENCES. CARNEGIE MELLON PROVIDES THIS
+ * SOFTWARE OR OTHER INTELLECTUAL PROPERTY IN ITS ``AS IS'' CONDITION,
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE OR
+ * INTELLECTUAL PROPERTY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Carnegie Mellon encourages (but does not require) users of this
+ * software or intellectual property to return any improvements or
+ * extensions that they make, and to grant Carnegie Mellon the rights to
+ * redistribute these changes without encumbrance.
+ */
+
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2005 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
#ifndef __tbsetdest_h__
#define __tbsetdest_h__
diff --git a/robots/vmcd/cam-sim.awk b/robots/vmcd/cam-sim.awk
index e8351ff494..bb7d1f2f5f 100755
--- a/robots/vmcd/cam-sim.awk
+++ b/robots/vmcd/cam-sim.awk
@@ -1,4 +1,11 @@
#! /usr/bin/awk -f
+
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
#
# cam-sim.awk - Simulate imaging of a floor grid into an overhead wide-angle camera.
# The default output is rows and then columns of grid points for gnuplot.
diff --git a/robots/vmcd/test_vmc-client.sh.in b/robots/vmcd/test_vmc-client.sh.in
index 0e21aded08..2e17d7f988 100644
--- a/robots/vmcd/test_vmc-client.sh.in
+++ b/robots/vmcd/test_vmc-client.sh.in
@@ -1,5 +1,11 @@
#! /bin/sh
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
## Variables
# The full path of the test case
diff --git a/robots/vmcd/test_vmcd.sh.in b/robots/vmcd/test_vmcd.sh.in
index 44e25a53b7..451bbecd4e 100644
--- a/robots/vmcd/test_vmcd.sh.in
+++ b/robots/vmcd/test_vmcd.sh.in
@@ -1,5 +1,11 @@
#! /bin/sh
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
## Variables
# The full path of the test case
diff --git a/robots/vmcd/test_vmcd2.sh b/robots/vmcd/test_vmcd2.sh
index cf11e29eb0..c266fef3ad 100644
--- a/robots/vmcd/test_vmcd2.sh
+++ b/robots/vmcd/test_vmcd2.sh
@@ -1,5 +1,11 @@
#! /bin/sh
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
## Variables
# The full path of the test case
diff --git a/robots/vmcd/test_vmcd3.sh b/robots/vmcd/test_vmcd3.sh
index 44d6733f89..e86cb63c61 100644
--- a/robots/vmcd/test_vmcd3.sh
+++ b/robots/vmcd/test_vmcd3.sh
@@ -1,5 +1,11 @@
#! /bin/sh
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
## Variables
# The full path of the test case
diff --git a/robots/vmcd/test_vmcd4.sh b/robots/vmcd/test_vmcd4.sh
index 84ba8c559c..87ffb97fd4 100644
--- a/robots/vmcd/test_vmcd4.sh
+++ b/robots/vmcd/test_vmcd4.sh
@@ -1,5 +1,11 @@
#! /bin/sh
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
## Variables
# The full path of the test case
--
GitLab