Extern tracks list to avoid linker issues with -fno-common.

ok deraadt@

diff --git a/usr.bin/cdio/cdio.c b/usr.bin/cdio/cdio.c
index 820327e..0f82466 100644 (file)
--- a/usr.bin/cdio/cdio.c
+++ b/usr.bin/cdio/cdio.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cdio.c,v 1.79 2020/06/26 19:51:14 naddy Exp $ */
+/*     $OpenBSD: cdio.c,v 1.80 2021/01/18 00:44:00 mortimer Exp $      */
 
 /*  Copyright (c) 1995 Serge V. Vakulenko
  * All rights reserved.
@@ -148,6 +148,8 @@ struct cmdtab {
 
 struct cd_toc_entry *toc_buffer;
 
+struct track_head tracks;
+
 char           *cdname;
 int            fd = -1;
 int            writeperm = 0;

diff --git a/usr.bin/cdio/extern.h b/usr.bin/cdio/extern.h
index 31b10e6..f7d67f0 100644 (file)
--- a/usr.bin/cdio/extern.h
+++ b/usr.bin/cdio/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.15 2010/03/01 02:09:44 krw Exp $ */
+/* $OpenBSD: extern.h,v 1.16 2021/01/18 00:44:00 mortimer Exp $ */
 /*
  * Copyright (c) 2002 Marc Espie.
  *
@@ -37,7 +37,8 @@ struct track_info {
        char type;
        int   speed; 
 };
-SLIST_HEAD(track_head, track_info) tracks;
+SLIST_HEAD(track_head, track_info);
+extern struct track_head tracks;
 
 /* Read/Write speed */
 #define DRIVE_SPEED_MAX                0xfffe