Skip to content

Solve#36 1 #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schplurtz wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Solve#36 1 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b34185
prevent using watches after delete
Dec 3, 2020
a2c7e3b
call GetSafePath only if needed
schplurtz Dec 3, 2020
3771465
change version to 0.5.13
schplurtz Dec 3, 2020
4d42fed
make debian version the same as incron itself
schplurtz Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
0.5.12 2020-12-03
* fix SEGV when directory are created in watched directories
0.5.12 2015-02-01
* added recursive directory watching
* added configuration parameters: recursive, dotdirs and loopable
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ PROJECT_NAME = incron
# This could be handy for archiving the generated documentation or
# if some version control system is used.

PROJECT_NUMBER = 0.5.12
PROJECT_NUMBER = 0.5.13

# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.12
0.5.13
8 changes: 8 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
incron (0.5.13-1) unstable; urgency=medium

* fixed bug #36 where incrond could die with SEGV.
(Closes: #973927)
(Closes: #947425)

-- Schplurtz le Déboulonné <Schplurtz@laposte.net> Thu, 03 Dec 2020 10:11:32 +0100

incron (0.5.12-1) unstable; urgency=medium

* linked homepage, watch-file and bugtracker to changes upstream on github
Expand Down
2 changes: 1 addition & 1 deletion incron.conf.5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "incron.conf" "5" "0.5.12" "Lukas Jelinek" "incron documentation"
.TH "incron.conf" "5" "0.5.13" "Lukas Jelinek" "incron documentation"
.SH "NAME"
/etc/incron.conf \- main config file for inotify cron (incron)
.SH "DESCRIPTION"
Expand Down
2 changes: 1 addition & 1 deletion incron.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define INCRONTAB_NAME "incrontab"

/// Application version (release)
#define INCRON_VERSION "0.5.12"
#define INCRON_VERSION "0.5.13"

/// Default configuration file
#define INCRON_CONFIG "/etc/incron.conf"
Expand Down
2 changes: 1 addition & 1 deletion incrond.8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "incrond" "8" "0.5.12" "Lukas Jelinek" "incron documentation"
.TH "incrond" "8" "0.5.13" "Lukas Jelinek" "incron documentation"
.SH "NAME"
incrond \- inotify cron (incron) daemon

Expand Down
2 changes: 1 addition & 1 deletion incrontab.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "incrontab" "1" "0.5.12" "Lukas Jelinek" "incron documentation"
.TH "incrontab" "1" "0.5.13" "Lukas Jelinek" "incron documentation"
.SH "NAME"
incrontab \- table manipulator for inotify cron (incron)
.SH "SYNOPSIS"
Expand Down
2 changes: 1 addition & 1 deletion incrontab.5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "incrontab" "5" "0.5.12" "Lukas Jelinek" "incron documentation"
.TH "incrontab" "5" "0.5.13" "Lukas Jelinek" "incron documentation"
.SH "NAME"
incrontab \- tables for driving inotify cron (incron)
.SH "DESCRIPTION"
Expand Down
3 changes: 2 additions & 1 deletion usertable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ void UserTable::OnEvent(InotifyEvent& rEvt)
syslog(LOG_INFO, "PATH (%s) FILE (%s) EVENT (%s)", pW->GetPath().c_str() , IncronTabEntry::GetSafePath(rEvt.GetName()).c_str() , events.c_str());
//#endif

std::string WPath = pW->GetPath(); // FIXME: Should Dispose() be moved after "$@" param is treated ?
// add new watch for newly created subdirs
if ( rEvt.IsType(IN_ISDIR) && (rEvt.IsType(IN_CREATE) || rEvt.IsType(IN_MOVED_TO)) )
{
Expand Down Expand Up @@ -422,7 +423,7 @@ void UserTable::OnEvent(InotifyEvent& rEvt)
else {
cmd.append(cs.substr(oldpos, pos-oldpos));
if (cs[px] == '@') { // base path
cmd.append(IncronTabEntry::GetSafePath(pW->GetPath()));
cmd.append(IncronTabEntry::GetSafePath(WPath));
oldpos = pos + 2;
}
else if (cs[px] == '#') { // file name
Expand Down