Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix copyright in main.c and misc/updatecopyright #1575

Merged
merged 2 commits into from
Jul 6, 2024

Conversation

michaelortmann
Copy link
Member

Found by: michaelortmann
Patch by: michaelortmann
Fixes:

One-line summary:
Fix copyright in main.c and misc/updatecopyright

Additional description (if needed):
We tried a fix of the copyright string with #1414
but we forgot to update misc/updatecopyright
so the fix was reverted by the last run of that script

Test cases demonstrating functionality (if applicable):
Test 1:
Before:

$ ./eggdrop -v
Eggdrop v1.9.5+python (C) 1997 Robey Pointer (C) 2010-2024 Eggheads

After:

$ ./eggdrop -v
Eggdrop v1.9.5+python (C) 1997 Robey Pointer (C) 1999-2024 Eggheads Development Team

Test 2:

$ misc/updatecopyright 2025
$ git diff src/main.c
diff --git a/src/main.c b/src/main.c
index d552f29f..003c4396 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,7 +7,7 @@
  */
 /*
  * Copyright (C) 1997 Robey Pointer
- * Copyright (C) 1999 - 2024 Eggheads Development Team
+ * Copyright (C) 1999 - 2025 Eggheads Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -979,13 +979,13 @@ int main(int arg_c, char **arg_v)
   egg_snprintf(egg_version, sizeof egg_version, "%s+%s %u", EGG_STRINGVER, EGG_PATCH, egg_numver);
   egg_snprintf(ver, sizeof ver, "eggdrop v%s+%s", EGG_STRINGVER, EGG_PATCH);
   strlcpy(version,
-          "Eggdrop v" EGG_STRINGVER "+" EGG_PATCH " (C) 1997 Robey Pointer (C) 1999-2024 Eggheads Development Team",
+          "Eggdrop v" EGG_STRINGVER "+" EGG_PATCH " (C) 1997 Robey Pointer (C) 1999-2025 Eggheads Development Team",
           sizeof version);
 #else
   egg_snprintf(egg_version, sizeof egg_version, "%s %u", EGG_STRINGVER, egg_numver);
   egg_snprintf(ver, sizeof ver, "eggdrop v%s", EGG_STRINGVER);
   strlcpy(version,
-          "Eggdrop v" EGG_STRINGVER " (C) 1997 Robey Pointer (C) 1999-2024 Eggheads Development Team",
+          "Eggdrop v" EGG_STRINGVER " (C) 1997 Robey Pointer (C) 1999-2025 Eggheads Development Team",
           sizeof version);
 #endif
$ ./eggdrop -v
Eggdrop v1.9.5+python (C) 1997 Robey Pointer (C) 1999-2025 Eggheads Development Team

@vanosg vanosg added this to the v1.10.0 milestone Jul 6, 2024
@vanosg vanosg merged commit e1f8bdc into eggheads:develop Jul 6, 2024
2 checks passed
@michaelortmann michaelortmann deleted the copyright2 branch July 6, 2024 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants