Log Message:
-----------
* *.conf (ALL_TESTS): support new ioctl test.
* progs/Makefile (BINS): build new ioctl test.
* t-ioctl.sh: test script for queryfile ioctl.
* progs/queryfile.c: utility program to invoke the QUERYFILE
unionfs ioctl (borrowed from unionfs-utils).
* progs/*.c: copyright updates.
Tags:
----
LKML-branch
Modified Files:
--------------
unionfs/regression-2.0:
ChangeLog (r1.1.2.29 -> r1.1.2.30)
brm.conf (r1.1.2.3 -> r1.1.2.4)
default.conf (r1.1.2.7 -> r1.1.2.8)
jffs2.conf (r1.1.2.3 -> r1.1.2.4)
nfs.conf (r1.1.2.3 -> r1.1.2.4)
thor.conf (r1.1.2.8 -> r1.1.2.9)
unionfs/regression-2.0/progs:
.cvsignore (r1.1.2.2 -> r1.1.2.3)
Makefile (r1.1.2.3 -> r1.1.2.4)
bug418.c (r1.1.2.2 -> r1.1.2.3)
creat-open.c (r1.1.2.2 -> r1.1.2.3)
flock-copyup.c (r1.1.2.2 -> r1.1.2.3)
fsync.c (r1.1.2.2 -> r1.1.2.3)
mapper.c (r1.1.2.2 -> r1.1.2.3)
open-unlink.c (r1.1.2.2 -> r1.1.2.3)
rename.c (r1.1.2.2 -> r1.1.2.3)
rmdircheckinode.c (r1.1.2.2 -> r1.1.2.3)
truncate.c (r1.1.2.2 -> r1.1.2.3)
Added Files:
-----------
unionfs/regression-2.0:
t-ioctl.sh (r1.1.2.1)
unionfs/regression-2.0/progs:
queryfile.c (r1.1.2.1)
Revision Data
-------------
--- /dev/null
+++ regression-2.0/t-ioctl.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# TEST: Branches: b0,b1=ro,b2=ro
+# TEST: run queryfile ioctl
+source scaffold
+
+function files {
+cat <<FILES
+d $TOP_LOWER_DIR
+d $LOWER_DIR0
+d $LOWER_DIR1
+d $LOWER_DIR2
+d $LOWER_DIR3
+FILES
+}
+
+function beforefiles {
+cat <<FILES
+d $LOWER_DIR0/D
+d $LOWER_DIR2/D
+
+f $LOWER_DIR0/.wh.a
+f $LOWER_DIR1/a
+f $LOWER_DIR2/a
+
+f $LOWER_DIR0/b
+f $LOWER_DIR1/c
+f $LOWER_DIR2/b
+FILES
+}
+
+function afterfiles {
+ beforefiles
+}
+
+# prepare expected output file
+
+function expected_output {
+cat <<FILES
+/mnt/unionfs/D /n/lower/b0 (rw-)
+/mnt/unionfs/D /n/lower/b2 (r--)
+/mnt/unionfs/b /n/lower/b0 (rw-)
+/mnt/unionfs/b /n/lower/b2 (r--)
+/mnt/unionfs/c /n/lower/b1 (r--)
+Unable to retrieve list of branches for /mnt/unionfs/a: No such file or
directory
+FILES
+}
+
+( files ; beforefiles) | create_hierarchy
+mount_union "" $LOWER_DIR0 $LOWER_DIR1=ro $LOWER_DIR2=ro
+expected_output > /tmp/.expected.$$
+
+(
+./progs/queryfile $MOUNTPOINT/D
+./progs/queryfile $MOUNTPOINT/b
+./progs/queryfile $MOUNTPOINT/c
+./progs/queryfile $MOUNTPOINT/a
+) > /tmp/.saveout.$$ 2>&1
+
+unmount_union
+# diff expected vs. actual out and exit on any change
+diff -b /tmp/.expected.$$ /tmp/.saveout.$$
+result=$?
+rm -f /tmp/.expected.$$ /tmp/.saveout.$$
+test $result != 0 && exit $result
+
+( files ; afterfiles ) | check_hierarchy $TOP_LOWER_DIR
+complete_test
+
Index: default.conf
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/default.conf,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -Lregression-2.0/default.conf -Lregression-2.0/default.conf -u -d -b -B -p
-r1.1.2.7 -r1.1.2.8
--- regression-2.0/default.conf
+++ regression-2.0/default.conf
@@ -8,6 +8,7 @@ ALL_TESTS="
t-create.sh
t-flock.sh
t-fsync.sh
+ t-ioctl.sh
t-link-rename.sh
t-link.sh
t-lookup-opaque.sh
Index: ChangeLog
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/ChangeLog,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -Lregression-2.0/ChangeLog -Lregression-2.0/ChangeLog -u -d -b -B -p
-r1.1.2.29 -r1.1.2.30
--- regression-2.0/ChangeLog
+++ regression-2.0/ChangeLog
@@ -1,3 +1,16 @@
+2007-05-30 Erez Zadok <[EMAIL PROTECTED]>
+
+ * *.conf (ALL_TESTS): support new ioctl test.
+
+ * progs/Makefile (BINS): build new ioctl test.
+
+ * t-ioctl.sh: test script for queryfile ioctl.
+
+ * progs/queryfile.c: utility program to invoke the QUERYFILE
+ unionfs ioctl (borrowed from unionfs-utils).
+
+ * progs/*.c: copyright updates.
+
2007-05-28 Erez Zadok <[EMAIL PROTECTED]>
* run-tests: reiserfs v3 mkfs command does not honor the -q flag
Index: thor.conf
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/thor.conf,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -Lregression-2.0/thor.conf -Lregression-2.0/thor.conf -u -d -b -B -p
-r1.1.2.8 -r1.1.2.9
--- regression-2.0/thor.conf
+++ regression-2.0/thor.conf
@@ -8,6 +8,7 @@ ALL_TESTS="
t-create.sh
t-flock.sh
t-fsync.sh
+ t-ioctl.sh
t-link-rename.sh
t-link.sh
t-lookup-opaque.sh
Index: jffs2.conf
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/jffs2.conf,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lregression-2.0/jffs2.conf -Lregression-2.0/jffs2.conf -u -d -b -B -p
-r1.1.2.3 -r1.1.2.4
--- regression-2.0/jffs2.conf
+++ regression-2.0/jffs2.conf
@@ -8,6 +8,7 @@ ALL_TESTS="
t-create.sh
t-flock.sh
t-fsync.sh
+ t-ioctl.sh
t-link-rename.sh
t-link.sh
t-lookup-opaque.sh
Index: nfs.conf
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/nfs.conf,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lregression-2.0/nfs.conf -Lregression-2.0/nfs.conf -u -d -b -B -p
-r1.1.2.3 -r1.1.2.4
--- regression-2.0/nfs.conf
+++ regression-2.0/nfs.conf
@@ -8,6 +8,7 @@ ALL_TESTS="
t-create.sh
t-flock.sh
t-fsync.sh
+ t-ioctl.sh
t-link-rename.sh
t-link.sh
t-lookup-opaque.sh
Index: brm.conf
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/brm.conf,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lregression-2.0/brm.conf -Lregression-2.0/brm.conf -u -d -b -B -p
-r1.1.2.3 -r1.1.2.4
--- regression-2.0/brm.conf
+++ regression-2.0/brm.conf
@@ -8,6 +8,7 @@ ALL_TESTS="
t-create.sh
t-flock.sh
t-fsync.sh
+ t-ioctl.sh
t-link-rename.sh
t-link.sh
t-lookup-opaque.sh
Index: rmdircheckinode.c
===================================================================
RCS file:
/home/cvs/unionfs/unionfs/regression-2.0/progs/Attic/rmdircheckinode.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lregression-2.0/progs/rmdircheckinode.c
-Lregression-2.0/progs/rmdircheckinode.c -u -d -b -B -p -r1.1.2.2 -r1.1.2.3
--- regression-2.0/progs/rmdircheckinode.c
+++ regression-2.0/progs/rmdircheckinode.c
@@ -9,7 +9,7 @@
* Copyright (c) 2003 Puja Gupta
* Copyright (c) 2003 Harikesavan Krishnan
* Copyright (c) 2003-2007 Stony Brook University
- * Copyright (c) 2003-2007 The Research Foundation of State University of New
York*
+ * Copyright (c) 2003-2007 The Research Foundation of SUNY
*
* For specific licensing information, see the COPYING file distributed with
* this package.
Index: rename.c
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/progs/Attic/rename.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lregression-2.0/progs/rename.c -Lregression-2.0/progs/rename.c -u -d -b
-B -p -r1.1.2.2 -r1.1.2.3
--- regression-2.0/progs/rename.c
+++ regression-2.0/progs/rename.c
@@ -9,7 +9,7 @@
* Copyright (c) 2003 Puja Gupta
* Copyright (c) 2003 Harikesavan Krishnan
* Copyright (c) 2003-2007 Stony Brook University
- * Copyright (c) 2003-2007 The Research Foundation of State University of New
York*
+ * Copyright (c) 2003-2007 The Research Foundation of SUNY
*
* For specific licensing information, see the COPYING file distributed with
* this package.
Index: flock-copyup.c
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/progs/Attic/flock-copyup.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lregression-2.0/progs/flock-copyup.c
-Lregression-2.0/progs/flock-copyup.c -u -d -b -B -p -r1.1.2.2 -r1.1.2.3
--- regression-2.0/progs/flock-copyup.c
+++ regression-2.0/progs/flock-copyup.c
@@ -9,7 +9,7 @@
* Copyright (c) 2003 Puja Gupta
* Copyright (c) 2003 Harikesavan Krishnan
* Copyright (c) 2003-2007 Stony Brook University
- * Copyright (c) 2003-2007 The Research Foundation of State University of New
York*
+ * Copyright (c) 2003-2007 The Research Foundation of SUNY
*
* For specific licensing information, see the COPYING file distributed with
* this package.
Index: truncate.c
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/progs/Attic/truncate.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lregression-2.0/progs/truncate.c -Lregression-2.0/progs/truncate.c -u -d
-b -B -p -r1.1.2.2 -r1.1.2.3
--- regression-2.0/progs/truncate.c
+++ regression-2.0/progs/truncate.c
@@ -9,7 +9,7 @@
* Copyright (c) 2003 Puja Gupta
* Copyright (c) 2003 Harikesavan Krishnan
* Copyright (c) 2003-2007 Stony Brook University
- * Copyright (c) 2003-2007 The Research Foundation of State University of New
York*
+ * Copyright (c) 2003-2007 The Research Foundation of SUNY
*
* For specific licensing information, see the COPYING file distributed with
* this package.
Index: fsync.c
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/progs/Attic/fsync.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lregression-2.0/progs/fsync.c -Lregression-2.0/progs/fsync.c -u -d -b -B
-p -r1.1.2.2 -r1.1.2.3
--- regression-2.0/progs/fsync.c
+++ regression-2.0/progs/fsync.c
@@ -9,7 +9,7 @@
* Copyright (c) 2003 Puja Gupta
* Copyright (c) 2003 Harikesavan Krishnan
* Copyright (c) 2003-2007 Stony Brook University
- * Copyright (c) 2003-2007 The Research Foundation of State University of New
York*
+ * Copyright (c) 2003-2007 The Research Foundation of SUNY
*
* For specific licensing information, see the COPYING file distributed with
* this package.
Index: mapper.c
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/progs/Attic/mapper.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lregression-2.0/progs/mapper.c -Lregression-2.0/progs/mapper.c -u -d -b
-B -p -r1.1.2.2 -r1.1.2.3
--- regression-2.0/progs/mapper.c
+++ regression-2.0/progs/mapper.c
@@ -1,6 +1,7 @@
/*
* Copyright (c) 1997-2007 Erez Zadok <[EMAIL PROTECTED]>
* Copyright (c) 2001-2007 Stony Brook University
+ * Copyright (c) 2003-2007 The Research Foundation of SUNY
*
* For specific licensing information, see the COPYING file distributed with
* this package, or get one from
--- /dev/null
+++ regression-2.0/progs/queryfile.c
@@ -0,0 +1,369 @@
+/*
+ * Copyright (c) 2003-2007 Erez Zadok
+ * Copyright (c) 2003-2006 Charles P. Wright
+ * Copyright (c) 2005-2007 Josef Sipek
+ * Copyright (c) 2005 Arun M. Krishnakumar
+ * Copyright (c) 2005-2006 David P. Quigley
+ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair
+ * Copyright (c) 2003 Puja Gupta
+ * Copyright (c) 2003 Harikesavan Krishnan
+ * Copyright (c) 2003-2007 Stony Brook University
+ * Copyright (c) 2003-2007 The Research Foundation of SUNY
+ *
+ * For specific licensing information, see the COPYING file distributed with
+ * this package.
+ *
+ * This Copyright notice must be kept intact and distributed with all sources.
+ */
+
+#include <sys/select.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <stdio.h>
+
+#define MAY_READ 4
+#define MAY_WRITE 2
+#define MAY_NFSRO 16
+
+# define UNIONFS_IOCTL_QUERYFILE _IOR(0x15, 15, int)
+
+/* Branch information */
+struct unionfs_branch {
+ char *path;
+ int perms;
+};
+
+static char **branches;
+static int *branchperms;
+
+int parse_rw(char *p) {
+ if (strcmp(p, "ro") == 0)
+ return MAY_READ;
+ else if (strcmp(p, "nfsro") == 0)
+ return MAY_READ | MAY_NFSRO;
+ else if (strcmp(p, "rw") == 0)
+ return MAY_READ | MAY_WRITE;
+ else
+ return 0;
+}
+
+char **parse_options(char *options)
+{
+ char **ret = NULL;
+ int i = 0;
+
+ char *p;
+ char *q;
+ char *r;
+ char *s, *t, *u;
+
+ p = options;
+ do {
+ q = strchr(p, ',');
+ if (q) {
+ *q++ = '\0';
+ }
+ if (!strncmp(p, "dirs=", strlen("dirs="))) {
+ r = p + strlen("dirs=");
+ do {
+ s = strchr(r, ':');
+ if (s) {
+ *s++ = '\0';
+ }
+
+ i++;
+ ret = realloc(ret, sizeof(char *) * (i + 1));
+ if (!ret) {
+ perror("realloc()");
+ return NULL;
+ }
+ branchperms =
+ realloc(branchperms, sizeof(int) * i);
+ if (!branchperms) {
+ perror("realloc()");
+ return NULL;
+ }
+
+ t = strchr(r, '=');
+ u = t + 1;
+ if (!t || !u || !*u)
+ goto err;
+ *t = 0;
+ branchperms[i - 1] = parse_rw(u);
+ if (!branchperms[i - 1]) {
+ err:
+ fprintf(stderr, "cannot parse '%s'\n",
+ r);
+ return NULL;
+ }
+ ret[i - 1] = strdup(r);
+ ret[i] = NULL;
+
+ r = s;
+ }
+ while (r);
+ }
+ p = q;
+ }
+ while (p);
+
+ branches = ret;
+ return ret;
+}
+
+/*
+ * This function will take a patch and check it against /proc/mounts to find
+ * its mount point. If uniononly is set then it will make sure its a unionfs
+ * mount point. This function assumes the both options and actual_path are
+ * valid and not null;
+ */
+int find_union(const char *path, char **options, char **actual_path,
+ int uniononly)
+{
+ FILE *f = NULL;
+ char *s = NULL;
+ char *s2 = NULL;
+ char *p;
+ char *q;
+ int candidate = 0;
+ int mallocsize = 1024; /* Just a reasonable starting value. */
+
+ retry:
+ if (*options) {
+ free(*options);
+ *options = NULL;
+ }
+
+ if (*actual_path) {
+ free(*actual_path);
+ *actual_path = NULL;
+ }
+ if (f) {
+ fclose(f);
+ f = NULL;
+ }
+ s2 = realloc(s, mallocsize);
+ if (!s2) {
+ fprintf(stderr, "realloc(%d): %s\n", mallocsize,
+ strerror(errno));
+ goto out;
+ }
+ s = s2;
+
+ f = fopen("/proc/mounts", "r");
+ if (!f) {
+ fprintf(stderr, "fopen(/proc/mounts): %s\n", strerror(errno));
+ goto out;
+ }
+ while (fgets(s, mallocsize, f)) {
+ int testcan;
+
+ /* If we don't have enough information, we should remalloc it. */
+ if (strlen(s) == (mallocsize - 1)) {
+ mallocsize *= 2;
+ goto retry;
+ }
+
+ p = strchr(s, ' ');
+ if (!p)
+ continue;
+ p++;
+
+ q = strchr(p, ' ');
+ if (!q)
+ continue;
+ *q++ = '\0';
+
+ testcan = strlen(p);
+ if (testcan <= candidate) {
+ continue;
+ }
+
+ if (!strncmp(path, p, testcan)) {
+ if (*actual_path) {
+ free(*actual_path);
+ }
+ *actual_path = strdup(p);
+ if (!*actual_path) {
+ fprintf(stderr, "strdup: %s\n",
+ strerror(errno));
+ goto out;
+ }
+ p = strchr(q, ' ');
+ if (!p)
+ continue;
+ *p++ = '\0';
+ if (uniononly) {
+ if (strcmp(q, "unionfs")) {
+ candidate = 0;
+ continue;
+ }
+ }
+ candidate = testcan;
+
+ q = strrchr(p, ' ');
+ if (!q)
+ continue;
+ *q = '\0';
+ q = strrchr(p, ' ');
+ if (!q)
+ continue;
+ *q = '\0';
+
+ if (*options) {
+ free(*options);
+ }
+ *options = strdup(p);
+ if (!*options) {
+ fprintf(stderr, "strdup: %s\n",
+ strerror(errno));
+ goto out;
+ }
+ }
+ }
+
+ out:
+ if (s)
+ free(s);
+ if (f)
+ fclose(f);
+
+ if (*options) {
+ return 0;
+ }
+
+ errno = -ENOENT;
+ return -1;
+}
+
+int load_branches(const char *union_path)
+{
+ int ret;
+ char *options = NULL, *actual_path = NULL;
+
+ ret = find_union(union_path, &options, &actual_path, 1);
+ if (ret) {
+ errno = EINVAL;
+ goto out;
+ }
+
+ branches = parse_options(options);
+ if (branches <= 0) {
+ fprintf(stderr, "Could not parse options from /proc/mounts!\n");
+ ret = -1;
+ goto out;
+ }
+
+ out:
+ if (options)
+ free(options);
+
+ if (actual_path)
+ free(actual_path);
+
+ return ret;
+}
+
+/*
+ * Resolves the real path of a relative path
+ */
+int get_real_path(const char *path, char *resolv_path)
+{
+ struct stat st;
+
+ if (realpath(path, resolv_path) == NULL) {
+ return -1;
+ }
+
+ if (strcmp(resolv_path, "/") && (resolv_path[strlen(resolv_path) - 1] ==
'/')) {
+ resolv_path[strlen(resolv_path) - 1] = '\0';
+ }
+
+ if (stat(resolv_path, &st) == -1) {
+ perror("stat()");
+ return -1;
+ }
+
+ return 0;
+}
+
+int unionfs_query(const char *file_path, struct unionfs_branch **ufs_branches)
+{
+ int i;
+ int fd;
+ int ret;
+ int len;
+ fd_set branchlist;
+ char resolv_path[PATH_MAX];
+
+ if ( get_real_path(file_path, resolv_path) )
+ return -1;
+
+ if ( load_branches(resolv_path) )
+ return -1;
+
+ if ((fd = open(file_path, O_RDONLY)) < 0) {
+ fprintf(stderr,
+ "Unable to open file %s : %s",
+ file_path, strerror(errno));
+ return -1;
+ }
+
+ len = ioctl(fd, UNIONFS_IOCTL_QUERYFILE, &branchlist);
+ if (len < 0) {
+ fprintf(stderr,
+ "Unable to retrieve list of branches for file %s : %s\n",
+ file_path, strerror(errno));
+ return -1;
+ }
+
+ ret = 0;
+ *ufs_branches = malloc(sizeof(struct unionfs_branch));
+ if (!(*ufs_branches)) {
+ errno = ENOMEM;
+ return -1;
+ }
+
+
+ for (i = 0; i <= len; i++) {
+ if (FD_ISSET(i, &branchlist)) {
+ *ufs_branches = realloc(*ufs_branches,
+ sizeof(struct unionfs_branch)*(ret+1));
+ (*ufs_branches)[ret].path = malloc(strlen(branches[ret]+1));
+ strcpy((*ufs_branches)[ret].path, branches[i]);
+ (*ufs_branches)[ret].perms = branchperms[i];
+ ret++;
+ }
+
+ }
+ return ret;
+}
+
+int main(int argc, char *argv[])
+{
+ struct unionfs_branch *branches;
+ int ret, i;
+
+ ret = unionfs_query(argv[1], &branches);
+ if (ret < 0) {
+ fprintf(stderr, "Unable to retrieve list of branches for %s: %s\n",
+ argv[1], strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+ for (i = 0; i < ret; i++) {
+ char r, w, n;
+ r = (branches[i].perms & MAY_READ) ? 'r' : '-';
+ w = (branches[i].perms & MAY_WRITE) ? 'w' : '-';
+ n = (branches[i].perms & MAY_NFSRO) ? 'n' : '-';
+ printf("%s\t%s (%c%c%c)\n", argv[1],
+ branches[i].path, r, w, n);
+ }
+ exit(EXIT_SUCCESS);
+}
Index: .cvsignore
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/progs/Attic/.cvsignore,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lregression-2.0/progs/.cvsignore -Lregression-2.0/progs/.cvsignore -u -d
-b -B -p -r1.1.2.2 -r1.1.2.3
--- regression-2.0/progs/.cvsignore
+++ regression-2.0/progs/.cvsignore
@@ -7,3 +7,4 @@ bug418
rmdircheckinode
rename
mapper
+queryfile
Index: bug418.c
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/progs/Attic/bug418.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lregression-2.0/progs/bug418.c -Lregression-2.0/progs/bug418.c -u -d -b
-B -p -r1.1.2.2 -r1.1.2.3
--- regression-2.0/progs/bug418.c
+++ regression-2.0/progs/bug418.c
@@ -9,7 +9,7 @@
* Copyright (c) 2003 Puja Gupta
* Copyright (c) 2003 Harikesavan Krishnan
* Copyright (c) 2003-2007 Stony Brook University
- * Copyright (c) 2003-2007 The Research Foundation of State University of New
York*
+ * Copyright (c) 2003-2007 The Research Foundation of SUNY
*
* For specific licensing information, see the COPYING file distributed with
* this package.
Index: creat-open.c
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/progs/Attic/creat-open.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lregression-2.0/progs/creat-open.c -Lregression-2.0/progs/creat-open.c -u
-d -b -B -p -r1.1.2.2 -r1.1.2.3
--- regression-2.0/progs/creat-open.c
+++ regression-2.0/progs/creat-open.c
@@ -9,7 +9,7 @@
* Copyright (c) 2003 Puja Gupta
* Copyright (c) 2003 Harikesavan Krishnan
* Copyright (c) 2003-2007 Stony Brook University
- * Copyright (c) 2003-2007 The Research Foundation of State University of New
York*
+ * Copyright (c) 2003-2007 The Research Foundation of SUNY
*
* For specific licensing information, see the COPYING file distributed with
* this package.
Index: open-unlink.c
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/progs/Attic/open-unlink.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lregression-2.0/progs/open-unlink.c -Lregression-2.0/progs/open-unlink.c
-u -d -b -B -p -r1.1.2.2 -r1.1.2.3
--- regression-2.0/progs/open-unlink.c
+++ regression-2.0/progs/open-unlink.c
@@ -9,7 +9,7 @@
* Copyright (c) 2003 Puja Gupta
* Copyright (c) 2003 Harikesavan Krishnan
* Copyright (c) 2003-2007 Stony Brook University
- * Copyright (c) 2003-2007 The Research Foundation of State University of New
York*
+ * Copyright (c) 2003-2007 The Research Foundation of SUNY
*
* For specific licensing information, see the COPYING file distributed with
* this package.
Index: Makefile
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/progs/Attic/Makefile,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lregression-2.0/progs/Makefile -Lregression-2.0/progs/Makefile -u -d -b
-B -p -r1.1.2.3 -r1.1.2.4
--- regression-2.0/progs/Makefile
+++ regression-2.0/progs/Makefile
@@ -9,7 +9,7 @@
# Copyright (c) 2003 Puja Gupta
# Copyright (c) 2003 Harikesavan Krishnan
# Copyright (c) 2003-2007 Stony Brook University
-# Copyright (c) 2003-2007 The Research Foundation of State University of New
York*
+# Copyright (c) 2003-2007 The Research Foundation of SUNY
#
# For specific licensing information, see the COPYING file distributed with
# this package.
@@ -19,7 +19,7 @@
CFLAGS=-g -Wall -Werror # -lefence
MOUNTPOINT=.
BINS=open-unlink flock-copyup fsync truncate bug418 rmdircheckinode \
- creat-open rename mapper
+ creat-open rename mapper queryfile
all: $(BINS)
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
