star_sym.c (schily-2021-08-14.tar.bz2) | : | star_sym.c (schily-2021-09-18.tar.bz2) | ||
---|---|---|---|---|
/* @(#)star_sym.c 1.21 18/07/23 Copyright 2005-2018 J. Schilling */ | /* @(#)star_sym.c 1.22 21/08/20 Copyright 2005-2021 J. Schilling */ | |||
#include <schily/mconfig.h> | #include <schily/mconfig.h> | |||
#ifndef lint | #ifndef lint | |||
static UConst char sccsid[] = | static UConst char sccsid[] = | |||
"@(#)star_sym.c 1.21 18/07/23 Copyright 2005-2018 J. Schilling"; | "@(#)star_sym.c 1.22 21/08/20 Copyright 2005-2021 J. Schilling"; | |||
#endif | #endif | |||
/* | /* | |||
* Read in the star inode data base and write a human | * Read in the star inode data base and write a human | |||
* readable version. | * readable version. | |||
* | * | |||
* Copyright (c) 2005-2018 J. Schilling | * Copyright (c) 2005-2021 J. Schilling | |||
*/ | */ | |||
/* | /* | |||
* The contents of this file are subject to the terms of the | * The contents of this file are subject to the terms of the | |||
* Common Development and Distribution License, Version 1.0 only | * Common Development and Distribution License, Version 1.0 only | |||
* (the "License"). You may not use this file except in compliance | * (the "License"). You may not use this file except in compliance | |||
* with the License. | * with the License. | |||
* | * | |||
* See the file CDDL.Schily.txt in this distribution for details. | * See the file CDDL.Schily.txt in this distribution for details. | |||
* A copy of the CDDL is also available via the Internet at | * A copy of the CDDL is also available via the Internet at | |||
* http://www.opensource.org/licenses/cddl1.txt | * http://www.opensource.org/licenses/cddl1.txt | |||
skipping to change at line 40 | skipping to change at line 40 | |||
#include <schily/standard.h> | #include <schily/standard.h> | |||
#include "star.h" | #include "star.h" | |||
#include "restore.h" | #include "restore.h" | |||
#include "dumpdate.h" | #include "dumpdate.h" | |||
#include <schily/jmpdefs.h> /* To include __jmalloc() */ | #include <schily/jmpdefs.h> /* To include __jmalloc() */ | |||
#include <schily/fcntl.h> | #include <schily/fcntl.h> | |||
#define GT_COMERR /* #define comerr gtcomerr */ | #define GT_COMERR /* #define comerr gtcomerr */ | |||
#define GT_ERROR /* #define error gterror */ | #define GT_ERROR /* #define error gterror */ | |||
#include <schily/schily.h> | #include <schily/schily.h> | |||
#include <schily/maxpath.h> | #include <schily/maxpath.h> | |||
#include <schily/nlsdefs.h> | ||||
#include "starsubs.h" | #include "starsubs.h" | |||
#ifndef HAVE_LSTAT | #ifndef HAVE_LSTAT | |||
#define lstat stat | #define lstat stat | |||
#endif | #endif | |||
#if S_ISUID == TSUID && S_ISGID == TSGID && S_ISVTX == TSVTX && \ | #if S_ISUID == TSUID && S_ISGID == TSGID && S_ISVTX == TSVTX && \ | |||
S_IRUSR == TUREAD && S_IWUSR == TUWRITE && S_IXUSR == TUEXEC && \ | S_IRUSR == TUREAD && S_IWUSR == TUWRITE && S_IXUSR == TUEXEC && \ | |||
S_IRGRP == TGREAD && S_IWGRP == TGWRITE && S_IXGRP == TGEXEC && \ | S_IRGRP == TGREAD && S_IWGRP == TGWRITE && S_IXGRP == TGEXEC && \ | |||
S_IROTH == TOREAD && S_IWOTH == TOWRITE && S_IXOTH == TOEXEC | S_IROTH == TOREAD && S_IWOTH == TOWRITE && S_IXOTH == TOEXEC | |||
skipping to change at line 236 | skipping to change at line 237 | |||
{ | { | |||
extern BOOL is_star; | extern BOOL is_star; | |||
int cac = ac; | int cac = ac; | |||
char *const *cav = av; | char *const *cav = av; | |||
char *opt = "help,h,version"; | char *opt = "help,h,version"; | |||
BOOL help = FALSE; | BOOL help = FALSE; | |||
BOOL prvers = FALSE; | BOOL prvers = FALSE; | |||
is_star = FALSE; | is_star = FALSE; | |||
save_args(ac, av); | save_args(ac, av); | |||
(void) setlocale(LC_ALL, ""); | ||||
#ifdef USE_NLS | ||||
#if !defined(TEXT_DOMAIN) /* Should be defined by cc -D */ | ||||
#define TEXT_DOMAIN "p" /* Use this only if it weren't */ | ||||
#endif | ||||
{ char *dir; | ||||
dir = searchfileinpath("share/locale", F_OK, | ||||
SIP_ANY_FILE|SIP_NO_PATH, NULL); | ||||
if (dir) | ||||
(void) bindtextdomain(TEXT_DOMAIN, dir); | ||||
else | ||||
#if defined(PROTOTYPES) && defined(INS_BASE) | ||||
(void) bindtextdomain(TEXT_DOMAIN, INS_BASE "/share/locale"); | ||||
#else | ||||
(void) bindtextdomain(TEXT_DOMAIN, "/usr/share/locale"); | ||||
#endif | ||||
(void) textdomain(TEXT_DOMAIN); | ||||
} | ||||
#endif /* USE_NLS */ | ||||
star_mkvers(); | star_mkvers(); | |||
cac--; | cac--; | |||
cav++; | cav++; | |||
if (getallargs(&cac, &cav, opt, &help, &help, &prvers) < 0) { | if (getallargs(&cac, &cav, opt, &help, &help, &prvers) < 0) { | |||
errmsgno(EX_BAD, "Bad Option: '%s'.\n", cav[0]); | errmsgno(EX_BAD, "Bad Option: '%s'.\n", cav[0]); | |||
usage(EX_BAD); | usage(EX_BAD); | |||
} | } | |||
if (help) | if (help) | |||
usage(0); | usage(0); | |||
if (prvers) { | if (prvers) { | |||
printf("%s: %s\n\n", get_progname(), vers); | printf("%s: %s\n\n", get_progname(), vers); | |||
gtprintf("Copyright (C) 2005-2018 Jörg Schilling\n"); | gtprintf("Copyright (C) 2005-2021 %s\n", _("Jörg Schilling")); | |||
gtprintf("This is free software; see the source for copying condi tions. There is NO\n"); | gtprintf("This is free software; see the source for copying condi tions. There is NO\n"); | |||
gtprintf("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); | gtprintf("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); | |||
exit(0); | exit(0); | |||
} | } | |||
/* | /* | |||
* As long as all options cause star_sym to exit, we may continue | * As long as all options cause star_sym to exit, we may continue | |||
* with this lazy arg handling. | * with this lazy arg handling. | |||
*/ | */ | |||
if (ac > 2) { | if (ac > 2) { | |||
End of changes. 6 change blocks. | ||||
4 lines changed or deleted | 27 lines changed or added |