diff options
| author | Michal Luscon | 2012-01-17 18:23:40 +0100 |
|---|---|---|
| committer | Karel Zak | 2012-03-27 13:04:58 +0200 |
| commit | 7f0cd3022a91d19b4fdd4af8f56d901e9ade5a3f (patch) | |
| tree | 7a5ac319ea1d1e76d9b8dfc7c74007e5eb1bae5e /misc-utils | |
| parent | eject: initial merge eject and util-linux (diff) | |
| download | kernel-qcow2-util-linux-7f0cd3022a91d19b4fdd4af8f56d901e9ade5a3f.tar.gz kernel-qcow2-util-linux-7f0cd3022a91d19b4fdd4af8f56d901e9ade5a3f.tar.xz kernel-qcow2-util-linux-7f0cd3022a91d19b4fdd4af8f56d901e9ade5a3f.zip | |
eject: clean up includes
Signed-off-by: Michal Luscon <mluscon@redhat.com>
Diffstat (limited to 'misc-utils')
| -rw-r--r-- | misc-utils/eject.c | 30 | ||||
| -rw-r--r-- | misc-utils/i18n.h | 22 |
2 files changed, 11 insertions, 41 deletions
diff --git a/misc-utils/eject.c b/misc-utils/eject.c index 172278e02..99f3a3c94 100644 --- a/misc-utils/eject.c +++ b/misc-utils/eject.c @@ -29,17 +29,12 @@ * */ -#include "i18n.h" +//#include "i18n.h" +#include "linux_version.h" +#include "c.h" +#include "nls.h" - -#define DEFAULTDEVICE "/dev/sr0" - - -#include <linux/version.h> -/* handy macro found in 2.1 kernels, but not in older ones */ -#ifndef KERNEL_VERSION -#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) -#endif +#define EJECT_DEFAULT_DEVICE "/dev/sr0" #include <unistd.h> #include <stdlib.h> @@ -48,9 +43,8 @@ #include <fcntl.h> #include <limits.h> -#ifdef GETOPTLONG + #include <getopt.h> -#endif /* GETOPTLONG */ #include <errno.h> #include <regex.h> #include <sys/types.h> @@ -58,11 +52,7 @@ #include <sys/ioctl.h> #include <sys/wait.h> #include <sys/mtio.h> -#include <linux/types.h> #include <linux/cdrom.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0) -#include <linux/ucdrom.h> -#endif #include <linux/fd.h> #include <sys/mount.h> #include <scsi/scsi.h> @@ -166,7 +156,7 @@ static void usage() "Parameter <name> can be a device file or a mount point.\n" "If omitted, name defaults to `%s'.\n" "By default tries -r, -s, -f, and -q in order until success.\n"), - DEFAULTDEVICE); + EJECT_DEFAULT_DEVICE); exit(1); } @@ -905,7 +895,7 @@ void HandleXOption(char *deviceName) /* main program */ int main(int argc, char **argv) { - const char *defaultDevice = DEFAULTDEVICE; /* default if no name passed by user */ + const char *defaultDevice = EJECT_DEFAULT_DEVICE; /* default if no name passed by user */ int worked = 0; /* set to 1 when successfully ejected */ char *device = 0; /* name passed from user */ char *fullName; /* expanded name */ @@ -918,7 +908,9 @@ int main(int argc, char **argv) char *pattern; /* regex for device if multiple partitions */ int ld = 6; /* symbolic link max depth */ - I18NCODE + setlocale(LC_ALL,""); + textdomain("eject"); + bindtextdomain("eject",LOCALEDIR); /* program name is global variable used by other procedures */ programName = strdup(argv[0]); diff --git a/misc-utils/i18n.h b/misc-utils/i18n.h deleted file mode 100644 index e4c821b8a..000000000 --- a/misc-utils/i18n.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - i18nized by: KUN-CHUNG, HSIEH <linuxer@coventive.com> - Taiwan - - Homepage: http://www.geocities.com/linux4tw/ - - 程式國際化設計: 謝崑中 -*/ - -#ifndef __i18n__ - #define __i18n__ - #define PKG "eject" - #define LOCALEDIR "/usr/share/locale" - - #include <locale.h> - #include <libintl.h> - #define _(str) gettext (str) - #define N_(str) (str) - #define I18NCODE setlocale(LC_ALL,""); textdomain(PKG); bindtextdomain(PKG,LOCALEDIR); - - void i18n_init (void); -#endif |