Artifact d80e44dc33ffa6365fcc7e98a2f27b6642d1b261

Ticket change [d80e44dc33] - Ticket 045f23be75 commit gives error "2fossil: unknown command:

<font"

status still Open with 1 other change by anonymous on 2009-07-25 21:07:00.

D 2009-07-25T21:07:00
J +comment \n\n<hr><i>anonymous\sadded\son\s2009-07-25\s21:07:00:</i><br>\nI'm\snew\sto\sthe\scode,\sbut\sseems\sthe\sproblem\sis\sthe\svalue\sstored\sin\sthe\ssqlite\sfield\slast-sync-url.\s\sIf\syou\strust\surl_parse()\sto\sset\sthe\sright\sg.urlCanonical\svalue,\sthen\ssimply\smaking\sboth\sclone.c\sand\ssync.c\sstore\sg.urlCanonical\sin\slast-sync-url\swould\sseem\sto\sfix\sthis\sconsistently:\r\n\r\n<verbatim>\r\n[jgm@centos\ssrc]$\sfossil\sdiff\r\nIndex:\ssrc/clone.c\r\n===================================================================\r\nfossil\sdiff\s/home/jgm/storage/workspace/fossil/work/src/clone.c\r\n---\ssrc/clone.c\r\n+++\ssrc/clone.c\r\n@@\s-56,12\s+56,12\s@@\r\n\s\s\s\s\sdb_record_repository_filename(g.argv[3]);\r\n\s\s\s\s\sdb_multi_exec(\r\n\s\s\s\s\s\s\s"REPLACE\sINTO\sconfig(name,value)"\r\n\s\s\s\s\s\s\s"\sVALUES('server-code',\slower(hex(randomblob(20))));"\r\n\s\s\s\s\s\s\s"REPLACE\sINTO\sconfig(name,value)"\r\n-\s\s\s\s\s\s"\sVALUES('last-sync-url',\s'file://%q');",\r\n-\s\s\s\s\s\sg.urlName\r\n+\s\s\s\s\s\s"\sVALUES('last-sync-url',\s'%q');",\r\n+\s\s\s\s\s\sg.urlCanonical\r\n\s\s\s\s\s);\r\n\s\s\s\s\sg.zLogin\s=\sdb_text(0,\s"SELECT\slogin\sFROM\suser\sWHERE\scap\sLIKE\s'%%s%%'");\r\n\s\s\s\s\sif(\sg.zLogin==0\s){\r\n\s\s\s\s\s\s\sdb_create_default_users(1);\r\n\s\s\s\s\s}\r\n@@\s-73,11\s+73,11\s@@\r\n\s\s\s\s\sdb_record_repository_filename(g.argv[3]);\r\n\s\s\s\s\sdb_initial_setup(0,\s0);\r\n\s\s\s\s\suser_select();\r\n\s\s\s\s\sdb_set("content-schema",\sCONTENT_SCHEMA,\s0);\r\n\s\s\s\s\sdb_set("aux-schema",\sAUX_SCHEMA,\s0);\r\n-\s\s\s\sdb_set("last-sync-url",\sg.argv[2],\s0);\r\n+\s\s\s\sdb_set("last-sync-url",\sg.urlCanonical,\s0);\r\n\s\s\s\s\sdb_multi_exec(\r\n\s\s\s\s\s\s\s"REPLACE\sINTO\sconfig(name,value)"\r\n\s\s\s\s\s\s\s"\sVALUES('server-code',\slower(hex(randomblob(20))));"\r\n\s\s\s\s\s);\r\n\s\s\s\s\surl_enable_proxy(0);\r\n\r\nIndex:\ssrc/sync.c\r\n===================================================================\r\nfossil\sdiff\s/home/jgm/storage/workspace/fossil/work/src/sync.c\r\n---\ssrc/sync.c\r\n+++\ssrc/sync.c\r\n@@\s-83,11\s+83,11\s@@\r\n\s\s\sif(\szUrl==0\s){\r\n\s\s\s\s\sif(\surlOptional\s)\sexit(0);\r\n\s\s\s\s\susage("URL");\r\n\s\s\s}\r\n\s\s\surl_parse(zUrl);\r\n-\s\sdb_set("last-sync-url",\szUrl,\s0);\r\n+\s\sdb_set("last-sync-url",\sg.urlCanonical,\s0);\r\n\s\s\suser_select();\r\n\s\s\sif(\sg.argc==2\s){\r\n\s\s\s\s\sif(\sg.urlPort!=g.urlDfltPort\s){\r\n\s\s\s\s\s\s\sprintf("Server:\s\s\s\s%s://%s:%d%s\\n",\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s\s\sg.urlProtocol,\sg.urlName,\sg.urlPort,\sg.urlPath);\r\n\r\n</verbatim>\r\n\r\n\r\nAnother\spossible\stact\sis\sto\smake\sminimal\schanges\sand\sinstead\sonly\schange\s1\sline\sin\ssync.c:\r\n\r\n<verbatim>\r\n[jgm@centos\swork2]$\sfossil\sdiff\r\nIndex:\ssrc/sync.c\r\n===================================================================\r\nfossil\sdiff\s/home/jgm/storage/workspace/fossil/work2/src/sync.c\r\n---\ssrc/sync.c\r\n+++\ssrc/sync.c\r\n@@\s-83,11\s+83,11\s@@\r\n\s\s\sif(\szUrl==0\s){\r\n\s\s\s\s\sif(\surlOptional\s)\sexit(0);\r\n\s\s\s\s\susage("URL");\r\n\s\s\s}\r\n\s\s\surl_parse(zUrl);\r\n-\s\sdb_set("last-sync-url",\szUrl,\s0);\r\n+\s\sdb_set("last-sync-url",\sg.urlIsFile\s?\sg.urlCanonical\s:\szUrl,\s0);\r\n\s\s\suser_select();\r\n\s\s\sif(\sg.argc==2\s){\r\n\s\s\s\s\sif(\sg.urlPort!=g.urlDfltPort\s){\r\n\s\s\s\s\s\s\sprintf("Server:\s\s\s\s%s://%s:%d%s\\n",\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s\s\sg.urlProtocol,\sg.urlName,\sg.urlPort,\sg.urlPath);\r\n\r\n</verbatim>\r\n\r\n\r\nDid\sI\soverlook\sanything?\r\n
K 045f23be750d93c0bd91f179f39c5c829ed01bc6
U anonymous
Z af8b1837d6bd4a20a70b89df24c995c9