head	1.3;
access;
symbols
	pkgsrc-2026Q1:1.3.0.74
	pkgsrc-2026Q1-base:1.3
	pkgsrc-2025Q4:1.3.0.72
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.3.0.70
	pkgsrc-2025Q3-base:1.3
	pkgsrc-2025Q2:1.3.0.68
	pkgsrc-2025Q2-base:1.3
	pkgsrc-2025Q1:1.3.0.66
	pkgsrc-2025Q1-base:1.3
	pkgsrc-2024Q4:1.3.0.64
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.62
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.60
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.58
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.56
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.54
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.52
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.50
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.3.0.48
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.3.0.46
	pkgsrc-2022Q3-base:1.3
	pkgsrc-2022Q2:1.3.0.44
	pkgsrc-2022Q2-base:1.3
	pkgsrc-2022Q1:1.3.0.42
	pkgsrc-2022Q1-base:1.3
	pkgsrc-2021Q4:1.3.0.40
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.3.0.38
	pkgsrc-2021Q3-base:1.3
	pkgsrc-2021Q2:1.3.0.36
	pkgsrc-2021Q2-base:1.3
	pkgsrc-2021Q1:1.3.0.34
	pkgsrc-2021Q1-base:1.3
	pkgsrc-2020Q4:1.3.0.32
	pkgsrc-2020Q4-base:1.3
	pkgsrc-2020Q3:1.3.0.30
	pkgsrc-2020Q3-base:1.3
	pkgsrc-2020Q2:1.3.0.26
	pkgsrc-2020Q2-base:1.3
	pkgsrc-2020Q1:1.3.0.6
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.3.0.28
	pkgsrc-2019Q4-base:1.3
	pkgsrc-2019Q3:1.3.0.24
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.22
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.20
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.18
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.16
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.14
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.12
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.10
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.8
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.4
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.3.0.2
	pkgsrc-2017Q1-base:1.3
	pkgsrc-2016Q4:1.2.0.32
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.30
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.28
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.26
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.24
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.22
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.20
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.18
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.16
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.14
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.12
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.10
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.8
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.6
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.2
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.1.0.14
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.12
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.10
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.8
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.6
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.4
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.2
	pkgsrc-2011Q2-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2017.01.04.17.19.52;	author roy;	state Exp;
branches;
next	1.2;
commitid	73LlSnqgtiwEQFAz;

1.2
date	2013.03.02.18.18.10;	author joerg;	state Exp;
branches;
next	1.1;

1.1
date	2011.04.04.11.00.39;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Use curses framework.
@
text
@$NetBSD: patch-ac,v 1.2 2013/03/02 18:18:10 joerg Exp $

--- ldapvi.c.orig	2007-05-05 10:17:26.000000000 +0000
+++ ldapvi.c
@@@@ -470,7 +470,7 @@@@ change_mechanism(bind_options *bo)
 		bo->authmethod = LDAP_AUTH_SASL;
 		puts("Switching to SASL authentication.");
 	}
-	bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech);
+	bo->sasl_mech = lv_getline("SASL mechanism", bo->sasl_mech);
 }
 
 static int
@@@@ -835,7 +835,7 @@@@ setcolor(int fg)
 {
 	char *bold = tigetstr("bold");
 	char *setaf = tigetstr("setaf");
-	if (setaf) putp(tparm(setaf, fg));
+	if (setaf) putp(tparm(setaf, fg, 0, 0, 0, 0, 0, 0, 0, 0));
 	if (bold) putp(bold);
 }
 
@@@@ -1465,7 +1465,7 @@@@ copy_sasl_output(FILE *out, char *sasl)
 	int line = 0;
 	int c;
 
-	if (lstat(sasl, &st) == -1) return;
+	if (lstat(sasl, &st) == -1) return 0;
 	if ( !(in = fopen(sasl, "r"))) syserr();
 
 	if (st.st_size > 0) {
@@@@ -1499,6 +1499,7 @@@@ copy_sasl_output(FILE *out, char *sasl)
 			fputc(c, out);
 		}
 	}
+	return line;
 }
 
 static GArray *
@


1.2
log
@Consistently return a value from non-void functions.
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.1 2011/04/04 11:00:39 drochner Exp $
d14 9
@


1.1
log
@rename local getline() function to avoid conflict with the libc
provided one in NetBSD-current
@
text
@d1 1
a1 1
$NetBSD$
d14 17
@