Commit d01c5902 authored by Diego Biurrun's avatar Diego Biurrun

cosmetics: Convert all tabs to spaces.

parent 02c21c75
...@@ -8,20 +8,20 @@ exec_prefix_set=no ...@@ -8,20 +8,20 @@ exec_prefix_set=no
usage() usage()
{ {
cat <<EOF cat <<EOF
Usage: dvdnav-config [OPTIONS] [LIBRARIES] Usage: dvdnav-config [OPTIONS] [LIBRARIES]
Options: Options:
[--prefix[=DIR]] [--prefix[=DIR]]
[--exec-prefix[=DIR]] [--exec-prefix[=DIR]]
[--version] [--version]
[--libs] [--libs]
[--cflags] [--cflags]
EOF EOF
exit $1 exit $1
} }
if test $# -eq 0; then if test $# -eq 0; then
usage 1 1>&2 usage 1 1>&2
fi fi
while test $# -gt 0; do while test $# -gt 0; do
...@@ -64,11 +64,11 @@ while test $# -gt 0; do ...@@ -64,11 +64,11 @@ while test $# -gt 0; do
done done
if test "$echo_prefix" = "yes"; then if test "$echo_prefix" = "yes"; then
echo $prefix echo $prefix
fi fi
if test "$echo_exec_prefix" = "yes"; then if test "$echo_exec_prefix" = "yes"; then
echo $exec_prefix echo $exec_prefix
fi fi
if test "$echo_cflags" = "yes"; then if test "$echo_cflags" = "yes"; then
......
...@@ -2,19 +2,19 @@ dvdreadlib="-ldvdread" ...@@ -2,19 +2,19 @@ dvdreadlib="-ldvdread"
usage() usage()
{ {
cat <<EOF cat <<EOF
Usage: dvdread-config [OPTIONS] [LIBRARIES] Usage: dvdread-config [OPTIONS] [LIBRARIES]
Options: Options:
[--prefix[=DIR]] [--prefix[=DIR]]
[--version] [--version]
[--libs] [--libs]
[--cflags] [--cflags]
EOF EOF
exit $1 exit $1
} }
if test $# -eq 0; then if test $# -eq 0; then
usage 1 1>&2 usage 1 1>&2
fi fi
while test $# -gt 0; do while test $# -gt 0; do
...@@ -44,7 +44,7 @@ while test $# -gt 0; do ...@@ -44,7 +44,7 @@ while test $# -gt 0; do
done done
if test "$echo_prefix" = "yes"; then if test "$echo_prefix" = "yes"; then
echo $prefix echo $prefix
fi fi
if test "$echo_cflags" = "yes"; then if test "$echo_cflags" = "yes"; then
...@@ -53,4 +53,4 @@ fi ...@@ -53,4 +53,4 @@ fi
if test "$echo_libs" = "yes"; then if test "$echo_libs" = "yes"; then
echo -L$libdir $dvdreadlib echo -L$libdir $dvdreadlib
fi fi
%define prefix @prefix@ %define prefix @prefix@
%define name @PACKAGE_NAME@ %define name @PACKAGE_NAME@
%define ver @PACKAGE_VERSION@ %define ver @PACKAGE_VERSION@
%define rel 0 %define rel 0
Name: %{name} Name: %{name}
Summary: Low level DVD access library Summary: Low level DVD access library
Version: %{ver} Version: %{ver}
Release: %{rel} Release: %{rel}
Group: Development/Libraries Group: Development/Libraries
Copyright: GPL Copyright: GPL
Url: http://dvd.sourceforge.net/ Url: http://dvd.sourceforge.net/
Source: %{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.gz
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description %description
libdvdread provides support to applications wishing to make use of basic libdvdread provides support to applications wishing to make use of basic
...@@ -21,7 +21,7 @@ DVD reading features. ...@@ -21,7 +21,7 @@ DVD reading features.
%setup %setup
%build %build
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
make make
%install %install
......
...@@ -14,7 +14,7 @@ getdir() { ...@@ -14,7 +14,7 @@ getdir() {
else else
filelist=`ls` filelist=`ls`
fi fi
for file in $filelist; do for file in $filelist; do
if test -d $file -a $file != "CVS" -a $file != $distdir; then if test -d $file -a $file != "CVS" -a $file != $distdir; then
...@@ -33,7 +33,7 @@ getdir() { ...@@ -33,7 +33,7 @@ getdir() {
if test ! -e $distfile; then if test ! -e $distfile; then
missingfile=${orifile##$topdir} missingfile=${orifile##$topdir}
echo "${missingfile#/} is missing in tarball" >> $logerror echo "${missingfile#/} is missing in tarball" >> $logerror
fi fi
fi fi
...@@ -60,7 +60,7 @@ main() { ...@@ -60,7 +60,7 @@ main() {
echo " * Log is ${log##*/}" echo " * Log is ${log##*/}"
echo " * Error log is ${logerror##*/}" echo " * Error log is ${logerror##*/}"
} }
main main
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
/* This needs to come after some library #include /* This needs to come after some library #include
to get __GNU_LIBRARY__ defined. */ to get __GNU_LIBRARY__ defined. */
#ifdef __GNU_LIBRARY__ #ifdef __GNU_LIBRARY__
/* Don't include stdlib.h for non-GNU C libraries because some of them /* Don't include stdlib.h for non-GNU C libraries because some of them
contain conflicting prototypes for getopt. */ contain conflicting prototypes for getopt. */
#include <stdlib.h> #include <stdlib.h>
...@@ -92,9 +92,9 @@ ...@@ -92,9 +92,9 @@
When compiling libc, the _ macro is predefined. */ When compiling libc, the _ macro is predefined. */
#ifdef HAVE_LIBINTL_H #ifdef HAVE_LIBINTL_H
#include <libintl.h> #include <libintl.h>
#define _(msgid) gettext (msgid) #define _(msgid) gettext (msgid)
#else #else
#define _(msgid) (msgid) #define _(msgid) (msgid)
#endif #endif
#endif #endif
...@@ -194,20 +194,20 @@ int optopt = '?'; ...@@ -194,20 +194,20 @@ int optopt = '?';
static enum static enum
{ {
REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
} }
ordering; ordering;
/* Value of POSIXLY_CORRECT environment variable. */ /* Value of POSIXLY_CORRECT environment variable. */
static char *posixly_correct; static char *posixly_correct;
#ifdef __GNU_LIBRARY__ #ifdef __GNU_LIBRARY__
/* We want to avoid inclusion of string.h with non-GNU libraries /* We want to avoid inclusion of string.h with non-GNU libraries
because there are many ways it can cause trouble. because there are many ways it can cause trouble.
On some systems, it contains special magic macros that don't work On some systems, it contains special magic macros that don't work
in GCC. */ in GCC. */
#include <string.h> #include <string.h>
#define my_index strchr #define my_index strchr
#else #else
/* Avoid depending on library functions or files /* Avoid depending on library functions or files
...@@ -220,13 +220,13 @@ static char * ...@@ -220,13 +220,13 @@ static char *
const char *str; const char *str;
int chr; int chr;
{ {
while (*str) while (*str)
{ {
if (*str == chr) if (*str == chr)
return (char *) str; return (char *) str;
str++; str++;
} }
return 0; return 0;
} }
/* If using GCC, we can safely declare strlen this way. /* If using GCC, we can safely declare strlen this way.
...@@ -270,10 +270,10 @@ static void store_args(int argc, char *const *argv) __attribute__((unused)); ...@@ -270,10 +270,10 @@ static void store_args(int argc, char *const *argv) __attribute__((unused));
static void static void
store_args(int argc, char *const *argv) store_args(int argc, char *const *argv)
{ {
/* XXX This is no good solution. We should rather copy the args so /* XXX This is no good solution. We should rather copy the args so
that we can compare them later. But we must not use malloc(3). */ that we can compare them later. But we must not use malloc(3). */
original_argc = argc; original_argc = argc;
original_argv = argv; original_argv = argv;
} }
text_set_element(__libc_subinit, store_args); text_set_element(__libc_subinit, store_args);
#endif #endif
...@@ -296,56 +296,56 @@ static void ...@@ -296,56 +296,56 @@ static void
exchange(argv) exchange(argv)
char **argv; char **argv;
{ {
int bottom = first_nonopt; int bottom = first_nonopt;
int middle = last_nonopt; int middle = last_nonopt;
int top = optind; int top = optind;
char *tem; char *tem;
/* Exchange the shorter segment with the far end of the longer segment. /* Exchange the shorter segment with the far end of the longer segment.
That puts the shorter segment into the right place. That puts the shorter segment into the right place.
It leaves the longer segment in the right place overall, It leaves the longer segment in the right place overall,
but it consists of two parts that need to be swapped next. */ but it consists of two parts that need to be swapped next. */
while (top > middle && middle > bottom) while (top > middle && middle > bottom)
{ {
if (top - middle > middle - bottom) if (top - middle > middle - bottom)
{ {
/* Bottom segment is the short one. */ /* Bottom segment is the short one. */
int len = middle - bottom; int len = middle - bottom;
register int i; register int i;
/* Swap it with the top part of the top segment. */ /* Swap it with the top part of the top segment. */
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
tem = argv[bottom + i]; tem = argv[bottom + i];
argv[bottom + i] = argv[top - (middle - bottom) + i]; argv[bottom + i] = argv[top - (middle - bottom) + i];
argv[top - (middle - bottom) + i] = tem; argv[top - (middle - bottom) + i] = tem;
} }
/* Exclude the moved bottom segment from further swapping. */ /* Exclude the moved bottom segment from further swapping. */
top -= len; top -= len;
} }
else else
{ {
/* Top segment is the short one. */ /* Top segment is the short one. */
int len = top - middle; int len = top - middle;
register int i; register int i;
/* Swap it with the bottom part of the bottom segment. */ /* Swap it with the bottom part of the bottom segment. */
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
tem = argv[bottom + i]; tem = argv[bottom + i];
argv[bottom + i] = argv[middle + i]; argv[bottom + i] = argv[middle + i];
argv[middle + i] = tem; argv[middle + i] = tem;
} }
/* Exclude the moved top segment from further swapping. */ /* Exclude the moved top segment from further swapping. */
bottom += len; bottom += len;
} }
} }
/* Update records for the slots the non-options now occupy. */ /* Update records for the slots the non-options now occupy. */
first_nonopt += (optind - last_nonopt); first_nonopt += (optind - last_nonopt);
last_nonopt = optind; last_nonopt = optind;
} }
/* Initialize the internal data when the first call is made. */ /* Initialize the internal data when the first call is made. */
...@@ -360,55 +360,55 @@ static const char * ...@@ -360,55 +360,55 @@ static const char *
char *const *argv; char *const *argv;
const char *optstring; const char *optstring;
{ {
/* Start processing options with ARGV-element 1 (since ARGV-element 0 /* Start processing options with ARGV-element 1 (since ARGV-element 0
is the program name); the sequence of previously skipped is the program name); the sequence of previously skipped
non-option ARGV-elements is empty. */ non-option ARGV-elements is empty. */
first_nonopt = last_nonopt = optind = 1; first_nonopt = last_nonopt = optind = 1;
nextchar = NULL; nextchar = NULL;
posixly_correct = getenv("POSIXLY_CORRECT"); posixly_correct = getenv("POSIXLY_CORRECT");
/* Determine how to handle the ordering of options and nonoptions. */ /* Determine how to handle the ordering of options and nonoptions. */
if (optstring[0] == '-') if (optstring[0] == '-')
{ {
ordering = RETURN_IN_ORDER; ordering = RETURN_IN_ORDER;
++optstring; ++optstring;
} }
else if (optstring[0] == '+') else if (optstring[0] == '+')
{ {
ordering = REQUIRE_ORDER; ordering = REQUIRE_ORDER;
++optstring; ++optstring;
} }
else if (posixly_correct != NULL) else if (posixly_correct != NULL)
ordering = REQUIRE_ORDER; ordering = REQUIRE_ORDER;
else else
ordering = PERMUTE; ordering = PERMUTE;
#ifdef _LIBC #ifdef _LIBC
if (posixly_correct == NULL if (posixly_correct == NULL
&& argc == original_argc && argv == original_argv) && argc == original_argc && argv == original_argv)
{ {
/* Bash 2.0 puts a special variable in the environment for each /* Bash 2.0 puts a special variable in the environment for each
command it runs, specifying which ARGV elements are the results of command it runs, specifying which ARGV elements are the results of
file name wildcard expansion and therefore should not be file name wildcard expansion and therefore should not be
considered as options. */ considered as options. */
char var[100]; char var[100];
sprintf(var, "_%d_GNU_nonoption_argv_flags_", getpid()); sprintf(var, "_%d_GNU_nonoption_argv_flags_", getpid());
nonoption_flags = getenv(var); nonoption_flags = getenv(var);
if (nonoption_flags == NULL) if (nonoption_flags == NULL)
nonoption_flags_len = 0; nonoption_flags_len = 0;
else else
nonoption_flags_len = strlen(nonoption_flags); nonoption_flags_len = strlen(nonoption_flags);
} }
else else
nonoption_flags_len = 0; nonoption_flags_len = 0;
#endif #endif
return optstring; return optstring;
} }
/* Scan elements of ARGV (whose length is ARGC) for option characters /* Scan elements of ARGV (whose length is ARGC) for option characters
...@@ -476,450 +476,450 @@ int ...@@ -476,450 +476,450 @@ int
int *longind; int *longind;
int long_only; int long_only;
{ {
optarg = NULL; optarg = NULL;
if (!__getopt_initialized || optind == 0) if (!__getopt_initialized || optind == 0)
{ {
optstring = _getopt_initialize(argc, argv, optstring); optstring = _getopt_initialize(argc, argv, optstring);
optind = 1; /* Don't scan ARGV[0], the program name. */ optind = 1; /* Don't scan ARGV[0], the program name. */
__getopt_initialized = 1; __getopt_initialized = 1;
} }
/* Test whether ARGV[optind] points to a non-option argument. /* Test whether ARGV[optind] points to a non-option argument.
Either it does not have option syntax, or there is an environment flag Either it does not have option syntax, or there is an environment flag
from the shell indicating it is not an option. The later information from the shell indicating it is not an option. The later information
is only used when the used in the GNU libc. */ is only used when the used in the GNU libc. */
#ifdef _LIBC #ifdef _LIBC
#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \ #define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \
|| (optind < nonoption_flags_len \ || (optind < nonoption_flags_len \
&& nonoption_flags[optind] == '1')) && nonoption_flags[optind] == '1'))
#else #else
#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0') #define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
#endif #endif
if (nextchar == NULL || *nextchar == '\0') if (nextchar == NULL || *nextchar == '\0')
{ {
/* Advance to the next ARGV-element. */ /* Advance to the next ARGV-element. */
/* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
moved back by the user (who may also have changed the arguments). */ moved back by the user (who may also have changed the arguments). */
if (last_nonopt > optind) if (last_nonopt > optind)
last_nonopt = optind; last_nonopt = optind;
if (first_nonopt > optind) if (first_nonopt > optind)
first_nonopt = optind; first_nonopt = optind;
if (ordering == PERMUTE) if (ordering == PERMUTE)
{ {
/* If we have just processed some options following some non-options, /* If we have just processed some options following some non-options,
exchange them so that the options come first. */ exchange them so that the options come first. */
if (first_nonopt != last_nonopt && last_nonopt != optind) if (first_nonopt != last_nonopt && last_nonopt != optind)
exchange((char **) argv); exchange((char **) argv);
else if (last_nonopt != optind) else if (last_nonopt != optind)
first_nonopt = optind; first_nonopt = optind;
/* Skip any additional non-options /* Skip any additional non-options
and extend the range of non-options previously skipped. */ and extend the range of non-options previously skipped. */
while (optind < argc && NONOPTION_P) while (optind < argc && NONOPTION_P)
optind++; optind++;
last_nonopt = optind; last_nonopt = optind;
} }
/* The special ARGV-element `--' means premature end of options. /* The special ARGV-element `--' means premature end of options.
Skip it like a null option, Skip it like a null option,
then exchange with previous non-options as if it were an option, then exchange with previous non-options as if it were an option,
then skip everything else like a non-option. */ then skip everything else like a non-option. */
if (optind != argc && !strcmp(argv[optind], "--")) if (optind != argc && !strcmp(argv[optind], "--"))
{ {
optind++; optind++;
if (first_nonopt != last_nonopt && last_nonopt != optind) if (first_nonopt != last_nonopt && last_nonopt != optind)
exchange((char **) argv); exchange((char **) argv);
else if (first_nonopt == last_nonopt) else if (first_nonopt == last_nonopt)
first_nonopt = optind; first_nonopt = optind;
last_nonopt = argc; last_nonopt = argc;
optind = argc; optind = argc;
} }
/* If we have done all the ARGV-elements, stop the scan /* If we have done all the ARGV-elements, stop the scan
and back over any non-options that we skipped and permuted. */ and back over any non-options that we skipped and permuted. */
if (optind == argc) if (optind == argc)
{ {
/* Set the next-arg-index to point at the non-options