Module Name: src
Committed By: bouyer
Date: Tue Jun 7 14:56:13 UTC 2011
Modified Files:
src/common/include/quota: quota.h quotaprop.h
src/common/lib/libquota: quotaprop.c quotasubr.c
src/lib/libquota: getfsquota.c getufsquota.c
src/sbin/fsck_ffs: pass6.c quota2.c
src/sys/sys: quota.h
src/sys/ufs/ffs: ffs_quota2.c
src/sys/ufs/ufs: quota1_subr.c quota2.h quota2_subr.c ufs_quota2.c
src/usr.bin/quota: getvfsquota.c
src/usr.sbin/quotactl: quotactl.c
Log Message:
Fix bad cut'n'paste in copyright. Pointed out by dyoung@
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/include/quota/quota.h \
src/common/include/quota/quotaprop.h
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libquota/quotaprop.c \
src/common/lib/libquota/quotasubr.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libquota/getfsquota.c \
src/lib/libquota/getufsquota.c
cvs rdiff -u -r1.2 -r1.3 src/sbin/fsck_ffs/pass6.c src/sbin/fsck_ffs/quota2.c
cvs rdiff -u -r1.3 -r1.4 src/sys/sys/quota.h
cvs rdiff -u -r1.2 -r1.3 src/sys/ufs/ffs/ffs_quota2.c
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/ufs/quota1_subr.c \
src/sys/ufs/ufs/quota2_subr.c src/sys/ufs/ufs/ufs_quota2.c
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/ufs/quota2.h
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/quota/getvfsquota.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/quotactl/quotactl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/include/quota/quota.h
diff -u src/common/include/quota/quota.h:1.1 src/common/include/quota/quota.h:1.2
--- src/common/include/quota/quota.h:1.1 Thu Mar 24 17:05:39 2011
+++ src/common/include/quota/quota.h Tue Jun 7 14:56:12 2011
@@ -1,9 +1,7 @@
-/* $NetBSD: quota.h,v 1.1 2011/03/24 17:05:39 bouyer Exp $ */
+/* $NetBSD: quota.h,v 1.2 2011/06/07 14:56:12 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Index: src/common/include/quota/quotaprop.h
diff -u src/common/include/quota/quotaprop.h:1.1 src/common/include/quota/quotaprop.h:1.2
--- src/common/include/quota/quotaprop.h:1.1 Thu Mar 24 17:05:39 2011
+++ src/common/include/quota/quotaprop.h Tue Jun 7 14:56:12 2011
@@ -1,9 +1,7 @@
-/* $NetBSD: quotaprop.h,v 1.1 2011/03/24 17:05:39 bouyer Exp $ */
+/* $NetBSD: quotaprop.h,v 1.2 2011/06/07 14:56:12 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Index: src/common/lib/libquota/quotaprop.c
diff -u src/common/lib/libquota/quotaprop.c:1.1 src/common/lib/libquota/quotaprop.c:1.2
--- src/common/lib/libquota/quotaprop.c:1.1 Thu Mar 24 17:05:40 2011
+++ src/common/lib/libquota/quotaprop.c Tue Jun 7 14:56:12 2011
@@ -1,9 +1,7 @@
-/* $NetBSD: quotaprop.c,v 1.1 2011/03/24 17:05:40 bouyer Exp $ */
+/* $NetBSD: quotaprop.c,v 1.2 2011/06/07 14:56:12 bouyer Exp $ */
/*-
* Copyright (c) 2011 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Index: src/common/lib/libquota/quotasubr.c
diff -u src/common/lib/libquota/quotasubr.c:1.1 src/common/lib/libquota/quotasubr.c:1.2
--- src/common/lib/libquota/quotasubr.c:1.1 Thu Mar 24 17:05:40 2011
+++ src/common/lib/libquota/quotasubr.c Tue Jun 7 14:56:12 2011
@@ -1,9 +1,7 @@
-/* $NetBSD: quotasubr.c,v 1.1 2011/03/24 17:05:40 bouyer Exp $ */
+/* $NetBSD: quotasubr.c,v 1.2 2011/06/07 14:56:12 bouyer Exp $ */
/*-
* Copyright (c) 2011 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Index: src/lib/libquota/getfsquota.c
diff -u src/lib/libquota/getfsquota.c:1.1 src/lib/libquota/getfsquota.c:1.2
--- src/lib/libquota/getfsquota.c:1.1 Thu Mar 24 17:05:43 2011
+++ src/lib/libquota/getfsquota.c Tue Jun 7 14:56:12 2011
@@ -1,10 +1,8 @@
-/* $NetBSD: getfsquota.c,v 1.1 2011/03/24 17:05:43 bouyer Exp $ */
+/* $NetBSD: getfsquota.c,v 1.2 2011/06/07 14:56:12 bouyer Exp $ */
/*-
* Copyright (c) 2011 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -29,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: getfsquota.c,v 1.1 2011/03/24 17:05:43 bouyer Exp $");
+__RCSID("$NetBSD: getfsquota.c,v 1.2 2011/06/07 14:56:12 bouyer Exp $");
#include <stdio.h>
#include <stdlib.h>
Index: src/lib/libquota/getufsquota.c
diff -u src/lib/libquota/getufsquota.c:1.1 src/lib/libquota/getufsquota.c:1.2
--- src/lib/libquota/getufsquota.c:1.1 Thu Mar 24 17:05:43 2011
+++ src/lib/libquota/getufsquota.c Tue Jun 7 14:56:12 2011
@@ -1,10 +1,8 @@
-/* $NetBSD: getufsquota.c,v 1.1 2011/03/24 17:05:43 bouyer Exp $ */
+/* $NetBSD: getufsquota.c,v 1.2 2011/06/07 14:56:12 bouyer Exp $ */
/*-
* Copyright (c) 2011 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -29,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: getufsquota.c,v 1.1 2011/03/24 17:05:43 bouyer Exp $");
+__RCSID("$NetBSD: getufsquota.c,v 1.2 2011/06/07 14:56:12 bouyer Exp $");
#include <stdio.h>
#include <stdlib.h>
Index: src/sbin/fsck_ffs/pass6.c
diff -u src/sbin/fsck_ffs/pass6.c:1.2 src/sbin/fsck_ffs/pass6.c:1.3
--- src/sbin/fsck_ffs/pass6.c:1.2 Sun Mar 6 17:08:16 2011
+++ src/sbin/fsck_ffs/pass6.c Tue Jun 7 14:56:12 2011
@@ -1,9 +1,7 @@
-/* $NetBSD: pass6.c,v 1.2 2011/03/06 17:08:16 bouyer Exp $ */
+/* $NetBSD: pass6.c,v 1.3 2011/06/07 14:56:12 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Index: src/sbin/fsck_ffs/quota2.c
diff -u src/sbin/fsck_ffs/quota2.c:1.2 src/sbin/fsck_ffs/quota2.c:1.3
--- src/sbin/fsck_ffs/quota2.c:1.2 Sun Mar 6 17:08:16 2011
+++ src/sbin/fsck_ffs/quota2.c Tue Jun 7 14:56:12 2011
@@ -1,9 +1,7 @@
-/* $NetBSD: quota2.c,v 1.2 2011/03/06 17:08:16 bouyer Exp $ */
+/* $NetBSD: quota2.c,v 1.3 2011/06/07 14:56:12 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Index: src/sys/sys/quota.h
diff -u src/sys/sys/quota.h:1.3 src/sys/sys/quota.h:1.4
--- src/sys/sys/quota.h:1.3 Thu Mar 24 17:05:45 2011
+++ src/sys/sys/quota.h Tue Jun 7 14:56:13 2011
@@ -1,9 +1,7 @@
-/* $NetBSD: quota.h,v 1.3 2011/03/24 17:05:45 bouyer Exp $ */
+/* $NetBSD: quota.h,v 1.4 2011/06/07 14:56:13 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Index: src/sys/ufs/ffs/ffs_quota2.c
diff -u src/sys/ufs/ffs/ffs_quota2.c:1.2 src/sys/ufs/ffs/ffs_quota2.c:1.3
--- src/sys/ufs/ffs/ffs_quota2.c:1.2 Sun Mar 6 17:08:38 2011
+++ src/sys/ufs/ffs/ffs_quota2.c Tue Jun 7 14:56:13 2011
@@ -1,9 +1,7 @@
-/* $NetBSD: ffs_quota2.c,v 1.2 2011/03/06 17:08:38 bouyer Exp $ */
+/* $NetBSD: ffs_quota2.c,v 1.3 2011/06/07 14:56:13 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -28,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_quota2.c,v 1.2 2011/03/06 17:08:38 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_quota2.c,v 1.3 2011/06/07 14:56:13 bouyer Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
Index: src/sys/ufs/ufs/quota1_subr.c
diff -u src/sys/ufs/ufs/quota1_subr.c:1.3 src/sys/ufs/ufs/quota1_subr.c:1.4
--- src/sys/ufs/ufs/quota1_subr.c:1.3 Thu Mar 24 17:05:45 2011
+++ src/sys/ufs/ufs/quota1_subr.c Tue Jun 7 14:56:13 2011
@@ -1,9 +1,7 @@
-/* $NetBSD: quota1_subr.c,v 1.3 2011/03/24 17:05:45 bouyer Exp $ */
+/* $NetBSD: quota1_subr.c,v 1.4 2011/06/07 14:56:13 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -28,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: quota1_subr.c,v 1.3 2011/03/24 17:05:45 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: quota1_subr.c,v 1.4 2011/06/07 14:56:13 bouyer Exp $");
#include <sys/types.h>
#include <machine/limits.h>
Index: src/sys/ufs/ufs/quota2_subr.c
diff -u src/sys/ufs/ufs/quota2_subr.c:1.3 src/sys/ufs/ufs/quota2_subr.c:1.4
--- src/sys/ufs/ufs/quota2_subr.c:1.3 Thu Mar 24 17:05:46 2011
+++ src/sys/ufs/ufs/quota2_subr.c Tue Jun 7 14:56:13 2011
@@ -1,9 +1,7 @@
-/* $NetBSD: quota2_subr.c,v 1.3 2011/03/24 17:05:46 bouyer Exp $ */
+/* $NetBSD: quota2_subr.c,v 1.4 2011/06/07 14:56:13 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -28,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: quota2_subr.c,v 1.3 2011/03/24 17:05:46 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: quota2_subr.c,v 1.4 2011/06/07 14:56:13 bouyer Exp $");
#include <sys/param.h>
#include <sys/time.h>
Index: src/sys/ufs/ufs/ufs_quota2.c
diff -u src/sys/ufs/ufs/ufs_quota2.c:1.3 src/sys/ufs/ufs/ufs_quota2.c:1.4
--- src/sys/ufs/ufs/ufs_quota2.c:1.3 Thu Mar 24 17:05:46 2011
+++ src/sys/ufs/ufs/ufs_quota2.c Tue Jun 7 14:56:13 2011
@@ -1,9 +1,7 @@
-/* $NetBSD: ufs_quota2.c,v 1.3 2011/03/24 17:05:46 bouyer Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.4 2011/06/07 14:56:13 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -28,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.3 2011/03/24 17:05:46 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.4 2011/06/07 14:56:13 bouyer Exp $");
#include <sys/buf.h>
#include <sys/param.h>
Index: src/sys/ufs/ufs/quota2.h
diff -u src/sys/ufs/ufs/quota2.h:1.4 src/sys/ufs/ufs/quota2.h:1.5
--- src/sys/ufs/ufs/quota2.h:1.4 Thu Mar 24 17:05:45 2011
+++ src/sys/ufs/ufs/quota2.h Tue Jun 7 14:56:13 2011
@@ -1,9 +1,7 @@
-/* $NetBSD: quota2.h,v 1.4 2011/03/24 17:05:45 bouyer Exp $ */
+/* $NetBSD: quota2.h,v 1.5 2011/06/07 14:56:13 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Index: src/usr.bin/quota/getvfsquota.c
diff -u src/usr.bin/quota/getvfsquota.c:1.6 src/usr.bin/quota/getvfsquota.c:1.7
--- src/usr.bin/quota/getvfsquota.c:1.6 Thu Mar 24 17:05:46 2011
+++ src/usr.bin/quota/getvfsquota.c Tue Jun 7 14:56:13 2011
@@ -1,10 +1,8 @@
-/* $NetBSD: getvfsquota.c,v 1.6 2011/03/24 17:05:46 bouyer Exp $ */
+/* $NetBSD: getvfsquota.c,v 1.7 2011/06/07 14:56:13 bouyer Exp $ */
/*-
* Copyright (c) 2011 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -29,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: getvfsquota.c,v 1.6 2011/03/24 17:05:46 bouyer Exp $");
+__RCSID("$NetBSD: getvfsquota.c,v 1.7 2011/06/07 14:56:13 bouyer Exp $");
#include <stdio.h>
#include <stdlib.h>
Index: src/usr.sbin/quotactl/quotactl.c
diff -u src/usr.sbin/quotactl/quotactl.c:1.3 src/usr.sbin/quotactl/quotactl.c:1.4
--- src/usr.sbin/quotactl/quotactl.c:1.3 Thu Mar 24 17:05:47 2011
+++ src/usr.sbin/quotactl/quotactl.c Tue Jun 7 14:56:13 2011
@@ -1,9 +1,7 @@
-/* $NetBSD: quotactl.c,v 1.3 2011/03/24 17:05:47 bouyer Exp $ */
+/* $NetBSD: quotactl.c,v 1.4 2011/06/07 14:56:13 bouyer Exp $ */
/*-
* Copyright (c) 2011 Manuel Bouyer
* All rights reserved.
- * This software is distributed under the following condiions
- * compliant with the NetBSD foundation policy.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -29,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: quotactl.c,v 1.3 2011/03/24 17:05:47 bouyer Exp $");
+__RCSID("$NetBSD: quotactl.c,v 1.4 2011/06/07 14:56:13 bouyer Exp $");
#endif /* not lint */
/*
