From 431910a2c080aba516c443fdd2eb9a0831018bc2 Mon Sep 17 00:00:00 2001 From: karl Date: Fri, 11 Apr 2008 15:44:00 +0000 Subject: [PATCH] gplv3+ --- src/cd-paranoia/buffering_write.c | 35 +++++++++++++------------- src/cd-paranoia/buffering_write.h | 36 +++++++++++++------------- src/cd-paranoia/cd-paranoia.c | 42 +++++++++++++++---------------- src/cd-paranoia/header.c | 13 +++++----- src/cd-paranoia/header.h | 23 ++++++++++++++--- src/cd-paranoia/report.c | 16 ++++++------ src/cd-paranoia/report.h | 17 +++++++++++++ src/cd-paranoia/usage-copy.h | 28 ++++++++++----------- src/cd-paranoia/utils.h | 17 ++++++------- src/cd-paranoia/version.h | 19 +++++++------- 10 files changed, 135 insertions(+), 111 deletions(-) diff --git a/src/cd-paranoia/buffering_write.c b/src/cd-paranoia/buffering_write.c index 2eef7ef3..03476844 100644 --- a/src/cd-paranoia/buffering_write.c +++ b/src/cd-paranoia/buffering_write.c @@ -1,24 +1,23 @@ /* - $Id: buffering_write.c,v 1.2 2004/12/19 01:43:38 rocky Exp $ + $Id: buffering_write.c,v 1.3 2008/04/11 15:44:00 karl Exp $ - Copyright (C) 2004 Rocky Bernstein - Copyright (C) 1998, 1999 Monty + Copyright (C) 2004, 2008 Rocky Bernstein + Copyright (C) 1998, 1999 Monty - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2, or (at - your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - */ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + /* Eliminate teeny little writes. patch submitted by Rob Ross --Monty 19991008 */ diff --git a/src/cd-paranoia/buffering_write.h b/src/cd-paranoia/buffering_write.h index ec81d97c..2fe7bd16 100644 --- a/src/cd-paranoia/buffering_write.h +++ b/src/cd-paranoia/buffering_write.h @@ -1,24 +1,22 @@ /* - $Id: buffering_write.h,v 1.2 2004/12/19 01:43:38 rocky Exp $ + $Id: buffering_write.h,v 1.3 2008/04/11 15:44:00 karl Exp $ - Copyright (C) 2004 Rocky Bernstein - Copyright (C) 1998 Monty - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2, or (at - your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - */ + Copyright (C) 2004, 2008 Rocky Bernstein + Copyright (C) 1998 Monty + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ extern long blocking_write(int outf, char *buffer, long i_num); diff --git a/src/cd-paranoia/cd-paranoia.c b/src/cd-paranoia/cd-paranoia.c index d9f104a1..491ffab0 100644 --- a/src/cd-paranoia/cd-paranoia.c +++ b/src/cd-paranoia/cd-paranoia.c @@ -1,26 +1,24 @@ /* - * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rocky Bernstein - * (C) 1998 Monty - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - * - * - * See ChangeLog for recent changes. - * - */ + $Id: cd-paranoia.c,v 1.36 2008/04/11 15:44:00 karl Exp $ + + Copyright (C) 2004, 2005, 2006, 2007, 2008 Rocky Bernstein + (C) 1998 Monty + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + See ChangeLog for recent changes. +*/ #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/src/cd-paranoia/header.c b/src/cd-paranoia/header.c index 624498f7..05eab01a 100644 --- a/src/cd-paranoia/header.c +++ b/src/cd-paranoia/header.c @@ -1,23 +1,22 @@ /* - $Id: header.c,v 1.1 2004/12/18 17:29:32 rocky Exp $ + $Id: header.c,v 1.2 2008/04/11 15:44:00 karl Exp $ Copyright (C) 2004 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu and Heiko Eissfeldt heiko@escape.colossus.de - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see . */ /** \file header.h diff --git a/src/cd-paranoia/header.h b/src/cd-paranoia/header.h index de899af1..99f94f9d 100644 --- a/src/cd-paranoia/header.h +++ b/src/cd-paranoia/header.h @@ -1,7 +1,22 @@ -/****************************************************************** - * CopyPolicy: GNU Public License 2 applies - * Copyright (C) 1998 Monty xiphmont@mit.edu - ******************************************************************/ +/* + $Id: header.h,v 1.2 2008/04/11 15:44:00 karl Exp $ + + Copyright (C) 2008 Rocky Bernstein + Copyright (C) 1998 Monty + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ /** \file header.h * \brief header for WAV, AIFF and AIFC header-writing routines. diff --git a/src/cd-paranoia/report.c b/src/cd-paranoia/report.c index 79c79d00..c1be3508 100644 --- a/src/cd-paranoia/report.c +++ b/src/cd-paranoia/report.c @@ -1,23 +1,23 @@ /* - $Id: report.c,v 1.2 2005/01/06 01:15:51 rocky Exp $ + $Id: report.c,v 1.3 2008/04/11 15:44:00 karl Exp $ - Copyright (C) 2004 Rocky Bernstein + Copyright (C) 2004, 2008 Rocky Bernstein Copyright (C) 1998 Monty xiphmont@mit.edu - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see . */ + /****************************************************************** * * reporting/logging routines diff --git a/src/cd-paranoia/report.h b/src/cd-paranoia/report.h index 70573398..d3031dfd 100644 --- a/src/cd-paranoia/report.h +++ b/src/cd-paranoia/report.h @@ -1,3 +1,20 @@ +/* + Copyright (C) 2008 Rocky Bernstein + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + extern void report(const char *s); extern void report2(const char *s, char *s2); extern void report3(const char *s, char *s2, char *s3); diff --git a/src/cd-paranoia/usage-copy.h b/src/cd-paranoia/usage-copy.h index 32ad6187..4297672d 100644 --- a/src/cd-paranoia/usage-copy.h +++ b/src/cd-paranoia/usage-copy.h @@ -1,20 +1,20 @@ /* - Copyright (C) 1999, 2005 Rocky Bernstein + Copyright (C) 1999, 2005, 2008 Rocky Bernstein - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + const char usage_help[] = "USAGE:\n" " cd-paranoia [options] [outfile]\n" diff --git a/src/cd-paranoia/utils.h b/src/cd-paranoia/utils.h index 44dcdd09..895229ba 100644 --- a/src/cd-paranoia/utils.h +++ b/src/cd-paranoia/utils.h @@ -1,22 +1,21 @@ /* - $Id: utils.h,v 1.4 2005/01/06 01:15:51 rocky Exp $ + $Id: utils.h,v 1.5 2008/04/11 15:44:00 karl Exp $ - Copyright (C) 2004, 2005 Rocky Bernstein - Copyright (C) 1998 Monty xiphmont@mit.edu + Copyright (C) 2004, 2005, 2008 Rocky Bernstein + Copyright (C) 1998 Monty - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see . */ #include diff --git a/src/cd-paranoia/version.h b/src/cd-paranoia/version.h index ab7cc280..6a366c97 100644 --- a/src/cd-paranoia/version.h +++ b/src/cd-paranoia/version.h @@ -1,22 +1,21 @@ /* - $Id: version.h,v 1.5 2008/03/08 18:11:11 rocky Exp $ + $Id: version.h,v 1.6 2008/04/11 15:44:00 karl Exp $ - Copyright (C) 2004, 2005, 2008 Rocky Bernstein - Copyright (C) 2001 Monty xiphmont@mit.edu - - This program is free software; you can redistribute it and/or modify + Copyright (C) 2004, 2005, 2008 Rocky Bernstein + Copyright (C) 2001 Monty + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see . */ /****************************************************************** * cdda_paranoia generation III release 9.8 libcdio