From owner-svn-src-head@FreeBSD.ORG Mon Mar 4 18:51:54 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 92FD5F97; Mon, 4 Mar 2013 18:51:54 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6CB09E20; Mon, 4 Mar 2013 18:51:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r24Ipsie064910; Mon, 4 Mar 2013 18:51:54 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r24IpraJ064904; Mon, 4 Mar 2013 18:51:53 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201303041851.r24IpraJ064904@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Mon, 4 Mar 2013 18:51:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r247810 - in head/contrib/openpam: doc/man lib X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Mar 2013 18:51:54 -0000 Author: des Date: Mon Mar 4 18:51:53 2013 New Revision: 247810 URL: http://svnweb.freebsd.org/changeset/base/247810 Log: Merge upstream r634:646: correctly parse mixed quoted / unquoted text. Modified: head/contrib/openpam/doc/man/openpam_straddch.3 head/contrib/openpam/lib/openpam_readline.c head/contrib/openpam/lib/openpam_readword.c Directory Properties: head/contrib/openpam/ (props changed) Modified: head/contrib/openpam/doc/man/openpam_straddch.3 ============================================================================== --- head/contrib/openpam/doc/man/openpam_straddch.3 Mon Mar 4 18:46:55 2013 (r247809) +++ head/contrib/openpam/doc/man/openpam_straddch.3 Mon Mar 4 18:51:53 2013 (r247810) @@ -34,7 +34,7 @@ .\" .\" $Id$ .\" -.Dd May 26, 2012 +.Dd March 3, 2013 .Dt OPENPAM_STRADDCH 3 .Os .Sh NAME @@ -73,6 +73,21 @@ and argument point to variables used to hold the size of the buffer and the length of the string it contains, respectively. .Pp +The final argument, +.Fa ch , +is the character that should be appended to +the string. If +.Fa ch +is 0, nothing is appended, but a new buffer is +still allocated if +.Fa str +is NULL. This can be used to +.Do +bootstrap +.Dc +the +string. +.Pp If a new buffer is allocated or an existing buffer is reallocated to make room for the additional character, .Fa str @@ -91,7 +106,9 @@ If the function is successful, it increments the integer variable pointed to by .Fa len -and returns 0. +(unless +.Fa ch +was 0) and returns 0. Otherwise, it leaves the variables pointed to by .Fa str , .Fa size Modified: head/contrib/openpam/lib/openpam_readline.c ============================================================================== --- head/contrib/openpam/lib/openpam_readline.c Mon Mar 4 18:46:55 2013 (r247809) +++ head/contrib/openpam/lib/openpam_readline.c Mon Mar 4 18:51:53 2013 (r247810) @@ -62,11 +62,9 @@ openpam_readline(FILE *f, int *lineno, s size_t len, size; int ch; - if ((line = malloc(size = MIN_LINE_LENGTH)) == NULL) { - openpam_log(PAM_LOG_ERROR, "malloc(): %m"); + line = NULL; + if (openpam_straddch(&line, &size, &len, 0) != 0) return (NULL); - } - len = 0; for (;;) { ch = fgetc(f); /* strip comment */ Modified: head/contrib/openpam/lib/openpam_readword.c ============================================================================== --- head/contrib/openpam/lib/openpam_readword.c Mon Mar 4 18:46:55 2013 (r247809) +++ head/contrib/openpam/lib/openpam_readword.c Mon Mar 4 18:51:53 2013 (r247810) @@ -86,13 +86,8 @@ openpam_readword(FILE *f, int *lineno, s /* begin quote */ quote = ch; /* edge case: empty quoted string */ - if (word == NULL && (word = malloc(1)) == NULL) { - openpam_log(PAM_LOG_ERROR, "malloc(): %m"); - errno = ENOMEM; + if (openpam_straddch(&word, &size, &len, 0) != 0) return (NULL); - } - *word = '\0'; - size = 1; } else if (ch == quote && !escape) { /* end quote */ quote = 0;