From cc205845406e0333b923e1e3b42adb2fb43d9545 Mon Sep 17 00:00:00 2001 From: naddy Date: Sat, 17 Mar 2012 22:36:25 +0000 Subject: [PATCH] getline -> get_line --- news/nn/Makefile | 4 ++-- news/nn/patches/patch-aux_c | 12 ++++++++++++ news/nn/patches/patch-global_c | 12 ++++++++++++ news/nn/patches/patch-global_h | 12 ++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 news/nn/patches/patch-aux_c create mode 100644 news/nn/patches/patch-global_c create mode 100644 news/nn/patches/patch-global_h diff --git a/news/nn/Makefile b/news/nn/Makefile index 304f09c58c4..31bb7f03086 100644 --- a/news/nn/Makefile +++ b/news/nn/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.7 2011/08/24 20:57:24 naddy Exp $ +# $OpenBSD: Makefile,v 1.8 2012/03/17 22:36:25 naddy Exp $ COMMENT = No News is Good News (Fast CLI Point & Read Newsreader) DISTNAME = nn-6.7.3 -REVISION = 0 +REVISION = 1 CATEGORIES = news HOMEPAGE = http://www.nndev.org diff --git a/news/nn/patches/patch-aux_c b/news/nn/patches/patch-aux_c new file mode 100644 index 00000000000..2b53ea98bc9 --- /dev/null +++ b/news/nn/patches/patch-aux_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-aux_c,v 1.1 2012/03/17 22:36:25 naddy Exp $ +--- aux.c.orig Sat Mar 17 16:30:12 2012 ++++ aux.c Sat Mar 17 16:30:54 2012 +@@ -507,7 +507,7 @@ aux_sh(article_header * ah, char *script, char *prog, + prompt_line = Lines - 1; + prompt("To: "); + unset_raw(); +- if (getline(&cc[0], sizeof(cc)) == 0) ++ if (get_line(&cc[0], sizeof(cc)) == 0) + cc[0] = CR; + nn_raw(); + if (cc[0] != CR) diff --git a/news/nn/patches/patch-global_c b/news/nn/patches/patch-global_c new file mode 100644 index 00000000000..c9e5c74aab6 --- /dev/null +++ b/news/nn/patches/patch-global_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-global_c,v 1.1 2012/03/17 22:36:25 naddy Exp $ +--- global.c.orig Sat Mar 17 16:30:05 2012 ++++ global.c Sat Mar 17 16:30:35 2012 +@@ -1312,7 +1312,7 @@ fgetstr(FILE * f) + */ + + int +-getline(char *line, int max) ++get_line(char *line, int max) + { + if (fgets(line, max, stdin) == NULL) + return 0; diff --git a/news/nn/patches/patch-global_h b/news/nn/patches/patch-global_h new file mode 100644 index 00000000000..783bf3b3325 --- /dev/null +++ b/news/nn/patches/patch-global_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-global_h,v 1.1 2012/03/17 22:36:26 naddy Exp $ +--- global.h.orig Sat Mar 17 16:29:59 2012 ++++ global.h Sat Mar 17 16:30:22 2012 +@@ -258,7 +258,7 @@ int nn_truncate(char *, off_t); + char *strsave(char *); + char *str3save(char *, char *, char *); + char *fgetstr(FILE *); +-int getline(char *, int); ++int get_line(char *, int); + extern char *tmp_directory; + extern char *nntp_cache_dir; + #endif /* _NN_GLOBAL_H */