Skip to content
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

Calendar Weeks + Doc-typo fix #1

Merged
merged 3 commits into from
Nov 8, 2014
Merged

Calendar Weeks + Doc-typo fix #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41d8805
add calendar weeks for pre
glftpd-scripts Nov 8, 2014
de11b6a
fix typo
glftpd-scripts Nov 8, 2014
b4743f7
add CW/KW as macro for dated pre-dirs
glftpd-scripts Nov 8, 2014
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: 1 addition & 1 deletion doc/README.foo-pre
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ installation;
"cp foo-pre /glftpd/bin/; cp pre.cfg /glftpd/etc/"

* Set correct permissions on foo-pre, it needs setuid bit set.
"chown root /gfltpd/bin/foo-pre; chmod 4711 /glftpd/bin/foo-pre"
"chown root /glftpd/bin/foo-pre; chmod 4711 /glftpd/bin/foo-pre"

* Add foo-pre in your glftpd.conf.
"site_cmd PRE EXEC /bin/foo-pre"
Expand Down
4 changes: 4 additions & 0 deletions src/pre/foo-pre.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,6 +1205,10 @@ char *section_expand_path(char *sec) {
strftime(buf, 1024, "%W", tm_now);
pre_replace(tmp, "WOY", buf);

strftime(buf, 1024, "%V", tm_now);
pre_replace(tmp, "CW", buf);
pre_replace(tmp, "KW", buf);

// if its a link then expand it.
reps = readlink(tmp, buf, 1024);

Expand Down
2 changes: 1 addition & 1 deletion src/pre/pre.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ group.DEFAULT.ratio=USERFILE
# In the 'dir' property you can use the following macros:
#
# DD - day (01-31), MM - month (01-12), YYYY - year 4 digits, YY - year 2 digits
# WW - week (00-53)
# WW - week (00-53), CW or KW - Calendar week (00-53)
#

#
Expand Down