From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752260AbbIRI14 (ORCPT ); Fri, 18 Sep 2015 04:27:56 -0400 Received: from mga14.intel.com ([192.55.52.115]:63326 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751395AbbIRI1y (ORCPT ); Fri, 18 Sep 2015 04:27:54 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,551,1437462000"; d="scan'208";a="807237000" From: Andy Shevchenko To: Andrew Morton , linux-kernel@vger.kernel.org, Alexander Viro Cc: Andy Shevchenko Subject: [PATCH v2 1/1] seq_file: re-use string_escape_str() Date: Fri, 18 Sep 2015 11:27:35 +0300 Message-Id: <1442564855-126418-1-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.5.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org strint_escape_str() escapes input string by given criteria. In case of seq_escape() the criteria is to convert some characters to their octal representation. Signed-off-by: Andy Shevchenko --- fs/seq_file.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/fs/seq_file.c b/fs/seq_file.c index 88d2792..6f0c3d7 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -377,26 +378,12 @@ EXPORT_SYMBOL(seq_release); */ void seq_escape(struct seq_file *m, const char *s, const char *esc) { - char *end = m->buf + m->size; - char *p; - char c; + char *buf; + size_t size = seq_get_buf(m, &buf); + int ret; - for (p = m->buf + m->count; (c = *s) != '\0' && p < end; s++) { - if (!strchr(esc, c)) { - *p++ = c; - continue; - } - if (p + 3 < end) { - *p++ = '\\'; - *p++ = '0' + ((c & 0300) >> 6); - *p++ = '0' + ((c & 070) >> 3); - *p++ = '0' + (c & 07); - continue; - } - seq_set_overflow(m); - return; - } - m->count = p - m->buf; + ret = string_escape_str(s, buf, size, ESCAPE_OCTAL, esc); + seq_commit(m, ret < size ? ret : -1); } EXPORT_SYMBOL(seq_escape); -- 2.5.1