From a3d497bf6ccc7141b66ada4b01a05068a09b31c3 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 29 Jul 2020 13:35:50 +0200 Subject: all: fix marking of auto-generated files Update the copyright checking script and more files for the standard convention of marking auto-generated files. --- executor/kvm.S.h | 2 +- executor/kvm_gen.cc | 2 +- sys/linux/init_vusb_ids.go | 2 +- sys/windows/windows.txt | 2 +- tools/check-copyright.sh | 2 +- tools/syz-usbgen/usbgen.go | 12 ++++++------ 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/executor/kvm.S.h b/executor/kvm.S.h index e0e325a3b..19b884ca0 100644 --- a/executor/kvm.S.h +++ b/executor/kvm.S.h @@ -1,4 +1,4 @@ -// AUTOGENERATED FILE +// Code generated by executor/kvm_gen.cc. DO NOT EDIT. const char kvm_asm16_cpl3[] = "\x0f\x20\xc0\x66\x83\xc8\x01\x0f\x22\xc0\xb8\xa0\x00\x0f\x00\xd8\xb8\x2b\x00\x8e\xd8\x8e\xc0\x8e\xe0\x8e\xe8\xbc\x00\x01\xc7\x06\x00\x01\x1d\xba\xc7\x06\x02\x01\x23\x00\xc7\x06\x04\x01\x00\x01\xc7\x06\x06\x01\x2b\x00\xcb"; const char kvm_asm32_paged[] = "\x0f\x20\xc0\x0d\x00\x00\x00\x80\x0f\x22\xc0"; const char kvm_asm32_vm86[] = "\x66\xb8\xb8\x00\x0f\x00\xd8\xea\x00\x00\x00\x00\xd0\x00"; diff --git a/executor/kvm_gen.cc b/executor/kvm_gen.cc index 000438f21..ce3a4d6de 100644 --- a/executor/kvm_gen.cc +++ b/executor/kvm_gen.cc @@ -19,7 +19,7 @@ void print(const char* name, const unsigned char* start, const unsigned char* en int main() { - printf("// AUTOGENERATED FILE\n"); + printf("// Code generated by executor/kvm_gen.cc. DO NOT EDIT.\n"); PRINT(kvm_asm16_cpl3); PRINT(kvm_asm32_paged); PRINT(kvm_asm32_vm86); diff --git a/sys/linux/init_vusb_ids.go b/sys/linux/init_vusb_ids.go index 9d130bb7d..affaec4fd 100644 --- a/sys/linux/init_vusb_ids.go +++ b/sys/linux/init_vusb_ids.go @@ -1,4 +1,4 @@ -// AUTOGENERATED FILE +// Code generated by tools/syz-usbgen. DO NOT EDIT. // See docs/linux/external_fuzzing_usb.md package linux diff --git a/sys/windows/windows.txt b/sys/windows/windows.txt index 74469de86..7c9dffe41 100644 --- a/sys/windows/windows.txt +++ b/sys/windows/windows.txt @@ -1,4 +1,4 @@ -# AUTOGENERATED FILE with tools/syz-declextract. +# Code generated by tools/syz-declextract. DO NOT EDIT. VerSetConditionMask(ConditionMask int64, TypeMask int32, Condition int8) GetEnvironmentStrings() diff --git a/tools/check-copyright.sh b/tools/check-copyright.sh index c6dcb36ce..ba6423b9e 100755 --- a/tools/check-copyright.sh +++ b/tools/check-copyright.sh @@ -11,7 +11,7 @@ for F in $(find . -name "*.go" -o -name "*.sh" -o -name "*.cc" -o -name "*.h" \ cat $F | tr '\n' '_' | egrep "(//|#) Copyright 20[0-9]{2}(/20[0-9]{2})? syzkaller project authors\. All rights reserved\._(//|#) Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file\." >/dev/null if [ $? -eq 0 ]; then continue; fi # Ignore auto-generated files. - egrep "(//|#) AUTOGENERATED FILE|(WARNING: This file is machine generated)" $F >/dev/null + egrep "^(//|#) Code generated .* DO NOT EDIT\\.|(WARNING: This file is machine generated)" $F >/dev/null if [ $? -eq 0 ]; then continue; fi # Ignore untracked files. git ls-files --error-unmatch $F >/dev/null 2>&1 diff --git a/tools/syz-usbgen/usbgen.go b/tools/syz-usbgen/usbgen.go index 61943f039..5b41c28e4 100644 --- a/tools/syz-usbgen/usbgen.go +++ b/tools/syz-usbgen/usbgen.go @@ -30,12 +30,12 @@ func main() { usbIds := extractIds(syslog, "USBID", 34) hidIds := extractIds(syslog, "HIDID", 24) - output := make([]byte, 0) - output = append(output, []byte("// AUTOGENERATED FILE\n")...) - output = append(output, []byte("// See docs/linux/external_fuzzing_usb.md\n")...) - output = append(output, []byte("\n")...) - output = append(output, []byte("package linux\n")...) - output = append(output, []byte("\n")...) + output := []byte(`// Code generated by tools/syz-usbgen. DO NOT EDIT. +// See docs/linux/external_fuzzing_usb.md + +package linux + +`) output = append(output, generateIdsVar(usbIds, "usbIds")...) output = append(output, []byte("\n")...) output = append(output, generateIdsVar(hidIds, "hidIds")...) -- cgit mrf-deployment