Remove pg_encoding. Not needed anymore since we have an initdb in C.
This commit is contained in:
parent
41fa9e9bae
commit
6949fc0269
src/bin
@ -5,7 +5,7 @@
|
||||
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
|
||||
# Portions Copyright (c) 1994, Regents of the University of California
|
||||
#
|
||||
# $PostgreSQL: pgsql/src/bin/Makefile,v 1.42 2004/04/20 00:33:47 pgsql Exp $
|
||||
# $PostgreSQL: pgsql/src/bin/Makefile,v 1.43 2004/04/20 00:40:06 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@ -14,8 +14,7 @@ top_builddir = ../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
DIRS := initdb initlocation ipcclean pg_ctl pg_dump \
|
||||
psql scripts pg_config pg_controldata pg_resetxlog \
|
||||
pg_encoding
|
||||
psql scripts pg_config pg_controldata pg_resetxlog
|
||||
|
||||
all install installdirs uninstall depend distprep:
|
||||
@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
|
||||
|
@ -1,32 +0,0 @@
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
# Makefile for src/bin/pg_encoding
|
||||
#
|
||||
# Copyright (c) 1998, PostgreSQL Global Development Group
|
||||
#
|
||||
# $PostgreSQL: pgsql/src/bin/pg_encoding/Makefile,v 1.16 2003/11/29 19:52:05 pgsql Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
subdir = src/bin/pg_encoding
|
||||
top_builddir = ../../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
OBJS= pg_encoding.o
|
||||
|
||||
all: submake-libpq submake-libpgport pg_encoding
|
||||
|
||||
pg_encoding: $(OBJS)
|
||||
$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@
|
||||
|
||||
install: all installdirs
|
||||
$(INSTALL_PROGRAM) pg_encoding$(X) $(DESTDIR)$(bindir)/pg_encoding$(X)
|
||||
|
||||
installdirs:
|
||||
$(mkinstalldirs) $(DESTDIR)$(bindir)
|
||||
|
||||
uninstall:
|
||||
rm -f $(DESTDIR)$(bindir)/pg_encoding$(X)
|
||||
|
||||
clean distclean maintainer-clean:
|
||||
rm -f pg_encoding$(X) pg_encoding.o
|
@ -1,100 +0,0 @@
|
||||
/*-------------------------------------------------------------------------
|
||||
*
|
||||
* pg_encoding.c
|
||||
*
|
||||
*
|
||||
* Copyright (c) 1998-2003, PostgreSQL Global Development Group
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/bin/pg_encoding/pg_encoding.c,v 1.14 2003/11/29 19:52:05 pgsql Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
#include "postgres.h"
|
||||
#include "miscadmin.h"
|
||||
#include "mb/pg_wchar.h"
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
static void usage(void);
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
char *p;
|
||||
int enc;
|
||||
bool be_only = FALSE;
|
||||
|
||||
if (argc < 2)
|
||||
{
|
||||
usage();
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "-b") == 0)
|
||||
{
|
||||
if (argc < 3)
|
||||
{
|
||||
usage();
|
||||
exit(1);
|
||||
}
|
||||
be_only = TRUE;
|
||||
p = argv[2];
|
||||
}
|
||||
else
|
||||
p = argv[1];
|
||||
|
||||
if (p && *p && isdigit((unsigned char) *p))
|
||||
{
|
||||
/*
|
||||
* Encoding number to name
|
||||
*/
|
||||
char *name;
|
||||
|
||||
enc = atoi(p);
|
||||
|
||||
if ((name = (char *) pg_encoding_to_char(enc)))
|
||||
{
|
||||
if (be_only && pg_valid_server_encoding(name) < 0)
|
||||
exit(1);
|
||||
|
||||
/*
|
||||
* pg_encoding_to_char() returns "" if invalid encoding number
|
||||
* is given
|
||||
*/
|
||||
else if (strcmp("", name))
|
||||
printf("%s\n", name);
|
||||
else
|
||||
exit(1);
|
||||
}
|
||||
exit(0);
|
||||
}
|
||||
else if (p && *p)
|
||||
{
|
||||
/*
|
||||
* Encoding name to encoding number
|
||||
*/
|
||||
if ((enc = pg_char_to_encoding(p)) >= 0)
|
||||
{
|
||||
if (be_only && pg_valid_server_encoding(p) < 0)
|
||||
exit(1);
|
||||
printf("%d\n", enc);
|
||||
}
|
||||
else
|
||||
exit(1);
|
||||
|
||||
exit(0);
|
||||
}
|
||||
exit(1);
|
||||
}
|
||||
|
||||
static void
|
||||
usage()
|
||||
{
|
||||
fprintf(stderr,
|
||||
"\nUsage: pg_encoding [options] encoding_name | encoding_number\n\n"
|
||||
"options:"
|
||||
" -b check if encoding is valid for backend\n\n"
|
||||
);
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user