d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Localize 'ls' output

Browse Source 
Don't set 8bit in quote processing
This commit is contained in:
ache 2003-08-06 08:46:21 +00:00
parent 7da3489308
commit 10de01a46b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sbin/restore/interactive.c
View File

@ -46,9 +46,10 @@ static const char rcsid[] =
#include <ufs/ufs/dir.h>
#include <protocols/dumprestore.h>
#include <setjmp.h>
#include <ctype.h>
#include <glob.h>
#include <limits.h>
#include <setjmp.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -421,7 +422,7 @@ copynext(char *input, char *output)
*/
quote = *cp++;
while (*cp != quote && *cp != '\0')
*bp++ = *cp++ | 0200;
*bp++ = *cp++;
if (*cp++ == '\0') {
fprintf(stderr, "missing %c\n", quote);
cp--;
@ -581,7 +582,7 @@ mkentry(char *name, struct direct *dp, struct afile *fp)
fp->fnum = dp->d_ino;
fp->fname = savename(dp->d_name);
for (cp = fp->fname; *cp; cp++)
if (!vflag && (*cp < ' ' || *cp >= 0177))
if (!vflag && !isprint((unsigned char)*cp))
*cp = '?';
fp->len = cp - fp->fname;
if (dflag && TSTINO(fp->fnum, dumpmap) == 0)
@ -748,7 +749,7 @@ glob_stat(const char *name, struct stat *stp)
static int
fcmp(const void *f1, const void *f2)
{
return (strcmp(((struct afile *)f1)->fname,
return (strcoll(((struct afile *)f1)->fname,
((struct afile *)f2)->fname));
}

3
sbin/restore/main.c
View File

@ -53,6 +53,7 @@ static const char rcsid[] =
#include <err.h>
#include <limits.h>
#include <locale.h>
#include <paths.h>
#include <stdio.h>
#include <stdlib.h>
@ -94,6 +95,8 @@ main(int argc, char *argv[])
if (argc < 2)
usage();
(void)setlocale(LC_ALL, "");
if ((inputdev = getenv("TAPE")) == NULL)
inputdev = _PATH_DEFTAPE;
obsolete(&argc, &argv);