pool/less
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/less?expand=0&rev=8

Browse Source
This commit is contained in:
OBS User unknown 2007-11-15 14:19:48 +00:00 committed by Git OBS Bridge
parent 2f74b01825
commit ee20985191
3 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
less-409-speed.patch
View File

@ -1,5 +1,5 @@
--- cmdbuf.c --- cmdbuf.c
+++ cmdbuf.c 2007-11-14 19:07:11.216430000 +0100 +++ cmdbuf.c 2007-11-15 12:38:14.513106799 +0100
@@ -14,11 +14,16 @@ @@ -14,11 +14,16 @@
* Used only by command() and related functions. * Used only by command() and related functions.
*/ */
@ -51,13 +51,18 @@
filename = histfile_name(); filename = histfile_name();
if (filename == NULL) if (filename == NULL)
@@ -1460,25 +1475,50 @@ save_cmdhist() @@ -1458,27 +1473,71 @@ save_cmdhist()
if (mlist_shell.modified)
modified = 1;
#endif #endif
if (!modified) - if (!modified)
+ if (!modified) {
+ free(filename);
return; return;
- f = fopen(filename, "w"); - f = fopen(filename, "w");
- free(filename); - free(filename);
- if (f == NULL) - if (f == NULL)
+ }
+#if HAVE_STAT +#if HAVE_STAT
+ /* Do not overwrite other users history files due `su' */ + /* Do not overwrite other users history files due `su' */
+ st.st_dev = st.st_ino = 0; + st.st_dev = st.st_ino = 0;
@ -70,30 +75,47 @@
+ ? (st.st_mode & 0020) + ? (st.st_mode & 0020)
+ : (st.st_mode & 0002)))) + : (st.st_mode & 0002))))
+ { + {
+ free(filename);
+ return;
+ }
+#endif
+ tempname = malloc((strlen(filename)+strlen("XXXXXX"))*sizeof(char)+2);
+ if (tempname == NULL) {
+ free(filename);
+ return;
+ }
+ sprintf(tempname, "%s.XXXXXX", filename);
+ (void)mktemp(tempname);
+ if (*tempname == '\0') {
+ free(filename);
+ free(tempname);
return; return;
-#if HAVE_FCHMOD -#if HAVE_FCHMOD
- /* Make history file readable only by owner. */ - /* Make history file readable only by owner. */
- fchmod(fileno(f), 0600); - fchmod(fileno(f), 0600);
+ } + }
#endif +
+ tempname = malloc((strlen(filename)+strlen("XXXXXX"))*sizeof(char)+2);
+ if (tempname == NULL)
+ return;
+ sprintf(tempname, "%s.XXXXXX", filename);
+ (void)mktemp(tempname);
- fprintf(f, "%s\n", HISTFILE_FIRST_LINE);
+ umask_save = umask(077); + umask_save = umask(077);
+#if HAVE_STAT +#if HAVE_STAT
+ fd = open(tempname, O_CREAT|O_EXCL|O_WRONLY|O_NOFOLLOW, (int)((st.st_mode & 0777) | 0600)); + fd = open(tempname, O_CREAT|O_EXCL|O_WRONLY|O_NOFOLLOW, ((st.st_mode & 0777) | 0600));
+#else +#else
+ fd = open(tempname, O_CREAT|O_EXCL|O_WRONLY|O_NOFOLLOW, 0600)); + fd = open(tempname, O_CREAT|O_EXCL|O_WRONLY|O_NOFOLLOW, 0600));
+#endif #endif
+ (void)umask(umask_save); + (void)umask(umask_save);
+ f = fdopen(fd, "w"); - fprintf(f, "%s\n", HISTFILE_FIRST_LINE);
+ if (f == NULL) + if (fd < 0) {
+ free(filename);
+ free(tempname);
+ return; + return;
+ }
+ f = fdopen(fd, "w");
+ if (f == NULL) {
+ free(filename);
+ free(tempname);
+ return;
+ }
+ setbuf(f, buf); + setbuf(f, buf);
+ fprintf(f, "%s\n", HISTFILE_FIRST_LINE); + fprintf(f, "%s\n", HISTFILE_FIRST_LINE);
fprintf(f, "%s\n", HISTFILE_SEARCH_SECTION); fprintf(f, "%s\n", HISTFILE_SEARCH_SECTION);

5
less.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 15 12:42:33 CET 2007 - werner@suse.de
- Avoid memory leaks in case of an error during saving history
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 14 19:10:18 CET 2007 - werner@suse.de Wed Nov 14 19:10:18 CET 2007 - werner@suse.de

4
less.spec
View File

@ -21,7 +21,7 @@ Provides: normal-less jless
Requires: file Requires: file
AutoReqProv: on AutoReqProv: on
Version: 409 Version: 409
Release: 5 Release: 7
Summary: Text File Browser and Pager Similar to more Summary: Text File Browser and Pager Similar to more
Url: http://www.greenwoodsoftware.com/less/ Url: http://www.greenwoodsoftware.com/less/
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
@ -109,6 +109,8 @@ rm -rf $RPM_BUILD_ROOT
%config %{sysconfdir}/* %config %{sysconfdir}/*
%{prefix}/bin/* %{prefix}/bin/*
%changelog %changelog
* Thu Nov 15 2007 - werner@suse.de
- Avoid memory leaks in case of an error during saving history
* Wed Nov 14 2007 - werner@suse.de * Wed Nov 14 2007 - werner@suse.de
- Speed up the history save by using a temorary file and make the - Speed up the history save by using a temorary file and make the
stream of that file a full buffered one. stream of that file a full buffered one.