- Timestamp:
- Jul 4, 2022, 2:52:51 PM (22 months ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- 1e1107a681a138069578c0396533c84b0b2e0ca3919e5c241ab4ac5f2b38cbf61fe777597e7c7e18
- Parents:
- aa37e4aece0beb7d9cba9d0719980e09c39a99c5
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/fehelp.cc
raa37e4 r3747de2 915 915 { 916 916 if (*p=='H') 917 #ifdef SINGULAR_4_2 918 snprintf(temp,256,"%s/%d-%d/index.htm", htmldir, 919 SINGULAR_VERSION/1000, 920 (SINGULAR_VERSION % 1000)/100 921 ); 922 #else 917 923 snprintf(temp,256,"%s/%d-%d-%d/index.htm", htmldir, 918 924 SINGULAR_VERSION/1000, … … 920 926 (SINGULAR_VERSION % 100)/10 921 927 ); 928 #endif 922 929 else 923 930 snprintf(temp,256,"%s/index.htm", htmldir); … … 926 933 { 927 934 if (*p=='H') 935 #ifdef SINGULAR_4_2 936 sprintf(temp,"%s/%d-%d/%s", htmldir, 937 SINGULAR_VERSION/1000, 938 (SINGULAR_VERSION % 1000)/100, 939 hentry->url); 940 else 941 sprintf(temp,"%s/%s", htmldir, hentry->url); 942 #else 928 943 sprintf(temp,"%s/%d-%d-%d/%s", htmldir, 929 944 SINGULAR_VERSION/1000, … … 932 947 hentry->url); 933 948 else 934 sprintf(temp,"%s/%d-%d-%d/%s", htmldir, hentry->url); 949 sprintf(temp,"%s/%s", htmldir, hentry->url); 950 #endif 935 951 } 936 952 else 937 953 if (*p=='H') 954 #ifdef SINGULAR_4_2 955 sprintf(temp,"%s/%d-%d/index.htm", htmldir, 956 SINGULAR_VERSION/1000, 957 (SINGULAR_VERSION % 1000)/100 958 ); 959 #else 938 960 sprintf(temp,"%s/%d-%d-%d/index.htm", htmldir, 939 961 SINGULAR_VERSION/1000, … … 941 963 (SINGULAR_VERSION % 100)/10 942 964 ); 965 #endif 943 966 else 944 967 sprintf(temp,"%s/index.htm", htmldir); … … 1029 1052 WarnS("information on Singular running under Emacs, type C-h m."); 1030 1053 } 1031 static int singular_manual(char *str, BOOLEAN isIndexEntry );1054 static int singular_manual(char *str, BOOLEAN isIndexEntry, heEntry hentry); 1032 1055 static void heBuiltinHelp(heEntry hentry, int /*br*/) 1033 1056 { 1034 1057 char* node = omStrDup(hentry != NULL && *(hentry->key) != '\0' ? 1035 1058 hentry->key : "Top"); 1036 singular_manual(node,(hentry != NULL) && *(hentry->url)!='\0' );1059 singular_manual(node,(hentry != NULL) && *(hentry->url)!='\0',hentry); 1037 1060 omFree(node); 1038 1061 } … … 1097 1120 1098 1121 /*************************************************/ 1099 static int singular_manual(char *str, BOOLEAN isIndexEntry )1122 static int singular_manual(char *str, BOOLEAN isIndexEntry,heEntry hentry) 1100 1123 { FILE *index=NULL; 1101 1124 unsigned long offset; … … 1132 1155 && (fgets(buffer, BUF_LEN, index) != (char *)0) 1133 1156 && (buffer[0] != FIN_INDEX)); 1157 char temp[256];temp[0]='\0'; 1158 char *htmldir = feResource('u'); /* always defined */ 1159 if (hentry != NULL && *(hentry->url) != '\0') 1160 #ifdef HAVE_VSNPRINTF 1161 { 1162 #ifdef SINGULAR_4_2 1163 snprintf(temp,256,"%s/%d-%d/%s", htmldir, 1164 SINGULAR_VERSION/1000, 1165 (SINGULAR_VERSION % 1000)/100, 1166 #else 1167 snprintf(temp,256,"%s/%d-%d-%d/%s", htmldir, 1168 SINGULAR_VERSION/1000, 1169 (SINGULAR_VERSION % 1000)/100, 1170 (SINGULAR_VERSION % 100)/10, 1171 #endif 1172 hentry->url); 1173 } 1174 #else 1175 { 1176 #ifdef SINGULAR_4_2 1177 sprintf(temp,"%s/%d-%d/%s", htmldir, 1178 SINGULAR_VERSION/1000, 1179 (SINGULAR_VERSION % 1000)/100, 1180 #else 1181 sprintf(temp,"%s/%d-%d-%d/%s", htmldir, 1182 SINGULAR_VERSION/1000, 1183 (SINGULAR_VERSION % 1000)/100, 1184 (SINGULAR_VERSION % 100)/10, 1185 #endif 1186 hentry->url); 1187 } 1188 #endif 1189 Print("url: %s\n",temp); 1134 1190 1135 1191 while(!feof(index))
Note: See TracChangeset
for help on using the changeset viewer.