Commit edc924e0 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds

fs/proc/array.c: convert to use string_escape_str()

Instead of custom approach let's use string_escape_str() to escape a given
string (task_name in this case).
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 198d1597
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
#include <linux/pid_namespace.h> #include <linux/pid_namespace.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/tracehook.h> #include <linux/tracehook.h>
#include <linux/string_helpers.h>
#include <linux/user_namespace.h> #include <linux/user_namespace.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -89,39 +90,18 @@ ...@@ -89,39 +90,18 @@
static inline void task_name(struct seq_file *m, struct task_struct *p) static inline void task_name(struct seq_file *m, struct task_struct *p)
{ {
int i; char *buf;
char *buf, *end;
char *name;
char tcomm[sizeof(p->comm)]; char tcomm[sizeof(p->comm)];
get_task_comm(tcomm, p); get_task_comm(tcomm, p);
seq_puts(m, "Name:\t"); seq_puts(m, "Name:\t");
end = m->buf + m->size;
buf = m->buf + m->count; buf = m->buf + m->count;
name = tcomm;
i = sizeof(tcomm); /* Ignore error for now */
while (i && (buf < end)) { string_escape_str(tcomm, &buf, m->size - m->count,
unsigned char c = *name; ESCAPE_SPACE | ESCAPE_SPECIAL, "\n\\");
name++;
i--;
*buf = c;
if (!c)
break;
if (c == '\\') {
buf++;
if (buf < end)
*buf++ = c;
continue;
}
if (c == '\n') {
*buf++ = '\\';
if (buf < end)
*buf++ = 'n';
continue;
}
buf++;
}
m->count = buf - m->buf; m->count = buf - m->buf;
seq_putc(m, '\n'); seq_putc(m, '\n');
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment