From 68ee5deade297f659f8690511dd55757b457d9e1 Mon Sep 17 00:00:00 2001 From: "graham.gower" Date: Mon, 16 Nov 2009 00:43:40 +0000 Subject: [PATCH] Remove dead code. git-svn-id: http://opkg.googlecode.com/svn/trunk@314 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358 --- libbb/Makefile.am | 1 - libbb/ask_confirmation.c | 49 ---------------------------------------- libbb/copy_file.c | 6 ----- libbb/libbb.h | 2 -- 4 files changed, 58 deletions(-) delete mode 100644 libbb/ask_confirmation.c diff --git a/libbb/Makefile.am b/libbb/Makefile.am index 1f2dd12..2da2dfd 100644 --- a/libbb/Makefile.am +++ b/libbb/Makefile.am @@ -15,7 +15,6 @@ libbb_la_SOURCES = gz_open.c \ perror_msg.c perror_msg_and_die.c \ xreadlink.c \ concat_path_file.c \ - ask_confirmation.c \ verror_msg.c vperror_msg.c \ xfuncs.c messages.c \ last_char_is.c \ diff --git a/libbb/ask_confirmation.c b/libbb/ask_confirmation.c deleted file mode 100644 index d4d943a..0000000 --- a/libbb/ask_confirmation.c +++ /dev/null @@ -1,49 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * Utility routines. - * - * Copyright (C) many different people. If you wrote this, please - * acknowledge your work. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#include -#include "libbb.h" - - -int ask_confirmation() -{ - int c = '\0'; - int ret = 0; - - while (c != '\n') { - c = getchar(); - if ( c != '\n' ) { - ret = ((c=='y')||(c=='Y')) ? 1 : 0; - } - } - return ret; -} - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ diff --git a/libbb/copy_file.c b/libbb/copy_file.c index c79fbeb..fb76669 100644 --- a/libbb/copy_file.c +++ b/libbb/copy_file.c @@ -134,12 +134,6 @@ int copy_file(const char *source, const char *dest, int flags) FILE *sfp, *dfp; if (dest_exists) { - if (flags & FILEUTILS_INTERACTIVE) { - fprintf(stderr, "%s: overwrite `%s'? ", applet_name, dest); - if (!ask_confirmation()) - return 0; - } - if ((dfp = fopen(dest, "w")) == NULL) { if (!(flags & FILEUTILS_FORCE)) { perror_msg("unable to open `%s'", dest); diff --git a/libbb/libbb.h b/libbb/libbb.h index e5b2df5..f4d8de0 100644 --- a/libbb/libbb.h +++ b/libbb/libbb.h @@ -217,7 +217,6 @@ enum { }; const char *make_human_readable_str(unsigned long size, unsigned long block_size, unsigned long display_unit); -int ask_confirmation(void); int klogctl(int type, char * b, int len); char *xgetcwd(char *cwd); @@ -287,7 +286,6 @@ enum { FILEUTILS_PRESERVE_SYMLINKS = 2, FILEUTILS_RECUR = 4, FILEUTILS_FORCE = 8, - FILEUTILS_INTERACTIVE = 16 }; extern const char *applet_name; -- 2.30.2