Explorar o código

dpkg: Switch showdiff() to command_get_pager()

Guillem Jover %!s(int64=14) %!d(string=hai) anos
pai
achega
12ffef5da1
Modificáronse 1 ficheiros con 2 adicións e 6 borrados
  1. 2 6
      src/configure.c

+ 2 - 6
src/configure.c

@@ -567,15 +567,11 @@ showdiff(const char *old, const char *new)
 	pid = subproc_fork();
 	if (!pid) {
 		/* Child process. */
-		const char *pager;
 		char cmdbuf[1024];
 
-		pager = getenv("PAGER");
-		if (str_is_unset(pager))
-			pager = DEFAULTPAGER;
-
 		sprintf(cmdbuf, DIFF " -Nu %.250s %.250s | %.250s",
-		        str_quote_meta(old), str_quote_meta(new), pager);
+		        str_quote_meta(old), str_quote_meta(new),
+		        command_get_pager());
 
 		command_shell(cmdbuf, _("conffile difference visualizer"));
 	}