projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import of readline 4.1
[deliverable/binutils-gdb.git]
/
readline
/
examples
/
rl.c
diff --git
a/readline/examples/rl.c
b/readline/examples/rl.c
index 17a63434f24f38ba404fc5a015bb05aca85d329e..2d1d17e600d7b658bfbfda6d3c45d7e1d696d456 100644
(file)
--- a/
readline/examples/rl.c
+++ b/
readline/examples/rl.c
@@
-2,15
+2,9
@@
* rl - command-line interface to read a line from the standard input
* (or another fd) using readline.
*
* rl - command-line interface to read a line from the standard input
* (or another fd) using readline.
*
- * usage: rl [-p prompt] [-u unit] [-d default]
+ * usage: rl [-p prompt] [-u unit] [-d default]
[-n nchars]
*/
*/
-/*
- * Remove the next line if you're compiling this against an installed
- * libreadline.a
- */
-#define READLINE_LIBRARY
-
#if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
@@
-18,8
+12,14
@@
#include <stdio.h>
#include <sys/types.h>
#include "posixstat.h"
#include <stdio.h>
#include <sys/types.h>
#include "posixstat.h"
-#include "readline.h"
-#include "history.h"
+
+#if defined (READLINE_LIBRARY)
+# include "readline.h"
+# include "history.h"
+#else
+# include <readline/readline.h>
+# include <readline/history.h>
+#endif
extern int optind;
extern char *optarg;
extern int optind;
extern char *optarg;
@@
-40,22
+40,24
@@
set_deftext ()
deftext = (char *)NULL;
rl_startup_hook = (Function *)NULL;
}
deftext = (char *)NULL;
rl_startup_hook = (Function *)NULL;
}
+ return 0;
}
static void
usage()
{
}
static void
usage()
{
- fprintf (stderr, "%s: usage: %s [-p prompt] [-u unit] [-d default]\n",
+ fprintf (stderr, "%s: usage: %s [-p prompt] [-u unit] [-d default]
[-n nchars]
\n",
progname, progname);
}
progname, progname);
}
+int
main (argc, argv)
int argc;
char **argv;
{
char *temp, *prompt;
struct stat sb;
main (argc, argv)
int argc;
char **argv;
{
char *temp, *prompt;
struct stat sb;
- int opt, fd;
+ int opt, fd
, nch
;
FILE *ifp;
progname = strrchr(argv[0], '/');
FILE *ifp;
progname = strrchr(argv[0], '/');
@@
-66,10
+68,10
@@
main (argc, argv)
/* defaults */
prompt = "readline$ ";
/* defaults */
prompt = "readline$ ";
- fd = 0;
+ fd =
nch =
0;
deftext = (char *)0;
deftext = (char *)0;
- while ((opt = getopt(argc, argv, "p:u:d:")) != EOF)
+ while ((opt = getopt(argc, argv, "p:u:d:
n:
")) != EOF)
{
switch (opt)
{
{
switch (opt)
{
@@
-87,6
+89,14
@@
main (argc, argv)
case 'd':
deftext = optarg;
break;
case 'd':
deftext = optarg;
break;
+ case 'n':
+ nch = atoi(optarg);
+ if (nch < 0)
+ {
+ fprintf (stderr, "%s: bad value for -n: `%s'\n", progname, optarg);
+ exit (2);
+ }
+ break;
default:
usage ();
exit (2);
default:
usage ();
exit (2);
@@
-107,6
+117,9
@@
main (argc, argv)
if (deftext && *deftext)
rl_startup_hook = set_deftext;
if (deftext && *deftext)
rl_startup_hook = set_deftext;
+ if (nch > 0)
+ rl_num_chars_to_read = nch;
+
temp = readline (prompt);
/* Test for EOF. */
temp = readline (prompt);
/* Test for EOF. */
This page took
0.024194 seconds
and
4
git commands to generate.